comparison rc/hgrc @ 354:21c25068de14

Set default style to compact, added rebase option as default.
author Edho Arief <edho@myconan.net>
date Tue, 29 May 2012 17:43:03 +0700
parents db66d53e10ea
children 6bf312e9a360
comparison
equal deleted inserted replaced
353:dd0b17d4b57a 354:21c25068de14
1 [ui] 1 [ui]
2 username = Edho Arief <edho@myconan.net> 2 username = Edho Arief <edho@myconan.net>
3 merge = vimdiff 3 merge = vimdiff
4 verbose = true 4 verbose = true
5 style = compact
5 6
6 [merge-tools] 7 [merge-tools]
7 vimdiff.executable = vim 8 vimdiff.executable = vim
8 vimdiff.args = -d $base $local $output $other +close +close 9 vimdiff.args = -d $base $local $output $other +close +close
9 10
10 [extensions] 11 [extensions]
11 #hgext.convert = 12 #hgext.convert =
12 #progress = 13 #progress =
13 hgext.bookmarks = 14 hgext.bookmarks =
14 mq = 15 mq =
16 rebase =
15 17
16 [hostfingerprints] 18 [hostfingerprints]
17 bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b 19 bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b
18 20
19 [defaults] 21 [defaults]