Mercurial > hg

comparison contrib/mergetools.hgrc @ 7385:8119c1a607c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools: add pointer to the usual filemerge path
author Brendan Cully <brendan@kublai.com>
date Sun, 16 Nov 2008 20:56:55 -0800
parents 8b67211d9140
children 950484f05f16
comparison
equal deleted inserted replaced
7384:62b75d73c33d 7385:8119c1a607c4
44 44
45 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output 45 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
46 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge 46 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
47 ecmerge.gui=True 47 ecmerge.gui=True
48 48
49 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
49 filemerge.args=-left $other -right $local -ancestor $base -merge $output 50 filemerge.args=-left $other -right $local -ancestor $base -merge $output
50 filemerge.gui=True 51 filemerge.gui=True