Mercurial > hg > config

comparison .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
comparison
equal deleted inserted replaced
53:bd91a6bc85cd 54:82d24a65cb0d
1 [ui] 1 [ui]
2 username = Jeff Hammel <k0scist@gmail.com> 2 username = Jeff Hammel <k0scist@gmail.com>
3 ignore = /home/jhammel/.hgignore 3 ignore = /home/jhammel/.hgignore
4 merge = internal:merge 4 merge = meld
5 5
6 [defaults] 6 [defaults]
7 commit = -v 7 commit = -v
8 8
9 [diff] 9 [diff]