Mercurial > dotfiles

comparison .hgrc @ 90:9f4b375f5d8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Augie Fackler <durin42@gmail.com>
date Mon, 20 Apr 2009 20:33:45 -0500
parents b958738c16f3
children 9d09939f1100
comparison
equal deleted inserted replaced
89:f34d90569fdc 90:9f4b375f5d8e
12 hgext.purge= 12 hgext.purge=
13 hgext.rebase= 13 hgext.rebase=
14 hgext.record= 14 hgext.record=
15 hgext.transplant= 15 hgext.transplant=
16 # hgext.zeroconf= 16 # hgext.zeroconf=
17 hgsubversion=/Stuff/hgsubversion 17 hgsubversion=
18 hggit= 18 hggit=
19 histedit= 19 histedit=
20
21 [merge-tools]
22 filemerge.executable = opendiff-w
23 filemerge.args = $local $other -ancestor $base -merge $output
20 24
21 [alias] 25 [alias]
22 ll=log --graph -l 6 26 ll=log --graph -l 6
23 27
24 [ui] 28 [ui]