view .hgrc @ 74:61b849df7c91

* Ignore file set to everything, so all files must be manually added
author Steve Huston <huston@srhuston.net>
date Sun, 21 Apr 2013 00:32:12 -0400
parents 09b915fb36b8
children e2f98d3b4b5b
line wrap: on
line source

[ui]
username = Steve Huston <huston@srhuston.net>
merge = vimdiff

[extensions]
convert =
keyword =
color =
hgsubversion = 

[merge-tools]
vimdiff.executable = vim
vimdiff.args = -d $base $local $output $other -c "wincmd J"