Mercurial > dotfiles

comparison .hgrc @ 226:f8a4c55ad070

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: update reference to histedit
author Augie Fackler <durin42@gmail.com>
date Mon, 04 Oct 2010 21:46:54 -0500
parents 226d1ac6acb6
children ff600674c701
comparison
equal deleted inserted replaced
225:cd77d083902b 226:f8a4c55ad070
14 hgext.transplant= 14 hgext.transplant=
15 hgext.schemes= 15 hgext.schemes=
16 hgext.progress= 16 hgext.progress=
17 hggit= 17 hggit=
18 hgsubversion= 18 hgsubversion=
19 histedit= 19 hg_histedit=
20 20
21 [merge-tools] 21 [merge-tools]
22 filemerge.executable = opendiff-w 22 filemerge.executable = opendiff-w
23 filemerge.args = $local $other -ancestor $base -merge $output 23 filemerge.args = $local $other -ancestor $base -merge $output
24 24