Mercurial > ec-dotfiles
annotate hg @ 43:b4965a1610f6
[bash] Yaaay bashrc.
author | Edho Prima Arief <me@myconan.net> |
---|---|
date | Tue, 26 Apr 2011 13:03:31 +0700 |
parents | a914a2168196 |
children | 7e462da3caa0 |
rev | line source |
---|---|
0 | 1 [ui] |
2 username = Edho Prima Arief <me@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] |
16 | 11 hgext.convert = |
34
a914a2168196
Merge, removed git support.
Edho Prima Arief <me@myconan.net>
parents:
27
diff
changeset
|
12 progress = |