Mercurial > index.cgi > dotfiles

diff .hgrc @ 73:09b915fb36b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* JT-65 alias for Wine on the home (ham shack) computer * .hgrc that I started experimenting with - since I really need to give Mercurial a better shot or at least remind myself why I stopped.
author huston@80426f53-59d1-405d-934b-f07cd76f4a1a
date Sat, 20 Apr 2013 00:29:24 +0000
parents
children e2f98d3b4b5b
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgrc	Sat Apr 20 00:29:24 2013 +0000
@@ -0,0 +1,13 @@
+[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"