Mercurial > ec-dotfiles

view hg @ 63:b7814634220a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[bash] branch merge, added EDITOR change to vim when detected.
author Edho Prima Arief <me@myconan.net>
date Sun, 08 May 2011 09:43:58 +0700
parents 7e462da3caa0
children e17886c8da43
line wrap: on
line source

[ui]
username = Edho Prima Arief <me@myconan.net>
merge = vimdiff
verbose = true

[merge-tools]
vimdiff.executable = vim
vimdiff.args = -d $base $local $output $other +close +close

[extensions]
#hgext.convert = 
#progress =