Mercurial > dotfiles

comparison .hgrc @ 112:57cbf4b59097

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This works better for old versions of hggit.
author Augie Fackler <durin42@gmail.com>
date Mon, 22 Jun 2009 13:33:46 -0500
parents 9d09939f1100
children a585b0d2b828
comparison
equal deleted inserted replaced
111:6a64e61359b7 112:57cbf4b59097
10 hgext.patchbomb= 10 hgext.patchbomb=
11 hgext.purge= 11 hgext.purge=
12 hgext.rebase= 12 hgext.rebase=
13 hgext.record= 13 hgext.record=
14 hgext.transplant= 14 hgext.transplant=
15 # hgext.zeroconf= 15 hggit=
16 hgsubversion= 16 hgsubversion=
17 hggit=
18 histedit= 17 histedit=
19 18
20 [merge-tools] 19 [merge-tools]
21 filemerge.executable = opendiff-w 20 filemerge.executable = opendiff-w
22 filemerge.args = $local $other -ancestor $base -merge $output 21 filemerge.args = $local $other -ancestor $base -merge $output