Mercurial Mercurial > hg / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/mergetools.hgrc
changeset 7385 8119c1a607c4
parent 6559 8b67211d9140
child 7665 950484f05f16
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
Mercurial