Mercurial > hg > config

diff .hgrc @ 54:82d24a65cb0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use meld as merge program
author Jeff Hammel <k0scist@gmail.com>
date Tue, 30 Mar 2010 08:22:49 -0700
parents bd91a6bc85cd
children aa97f8ac0cbe
line wrap: on
line diff
--- a/.hgrc	Mon Mar 29 12:09:32 2010 -0700
+++ b/.hgrc	Tue Mar 30 08:22:49 2010 -0700
@@ -1,7 +1,7 @@
 [ui]
 username = Jeff Hammel <k0scist@gmail.com>
 ignore = /home/jhammel/.hgignore
-merge = internal:merge
+merge = meld
 
 [defaults]
 commit = -v