Mercurial > ec-dotfiles
annotate hg @ 97:65ce115fd21d
Merge.
author | Edho Prima Arief <edho@myconan.net> |
---|---|
date | Thu, 14 Jul 2011 00:51:44 +0700 |
parents | e17886c8da43 |
children | ed3d1b8e6f45 |
rev | line source |
---|---|
0 | 1 [ui] |
91 | 2 username = Edho Prima Arief <edho@myconan.net> |
10 | 3 merge = vimdiff |
34
a914a2168196
Merge, removed git support.
Edho Prima Arief <me@myconan.net>
parents:
27
diff
changeset
|
4 verbose = true |
10 | 5 |
6 [merge-tools] | |
7 vimdiff.executable = vim | |
8 vimdiff.args = -d $base $local $output $other +close +close | |
9 | |
14 | 10 [extensions] |
45
7e462da3caa0
[hg] Comment sometimes unavailable extension.
Edho Prima Arief <me@myconan.net>
parents:
34
diff
changeset
|
11 #hgext.convert = |
7e462da3caa0
[hg] Comment sometimes unavailable extension.
Edho Prima Arief <me@myconan.net>
parents:
34
diff
changeset
|
12 #progress = |