Mercurial > ec-dotfiles

comparison hg @ 34:a914a2168196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge, removed git support.
author Edho Prima Arief <me@myconan.net>
date Sun, 27 Mar 2011 11:32:23 +0000
parents bbd189f52beb
children 7e462da3caa0
comparison
equal deleted inserted replaced
33:330587be514c 34:a914a2168196
1 [ui] 1 [ui]
2 username = Edho Prima Arief <me@myconan.net> 2 username = Edho Prima Arief <me@myconan.net>
3 merge = vimdiff 3 merge = vimdiff
4 verbose = true
4 5
5 [merge-tools] 6 [merge-tools]
6 vimdiff.executable = vim 7 vimdiff.executable = vim
7 vimdiff.args = -d $base $local $output $other +close +close 8 vimdiff.args = -d $base $local $output $other +close +close
8 9
9 [extensions] 10 [extensions]
10 hgext.convert = 11 hgext.convert =
11 hgext.bookmarks = 12 progress =
12 hgext.rebase =
13 hggit =
14