Geek Answers Handbook

How to make diffmerge do tripartite merge with Mercurial?

I am currently using commmand hg diffmerge -r 32 -r 30 myfile, but this only displays two windows, not three. How can I do this merge in three ways?

.hgrc

[ui]
merge=diffmerge

[extensions]
collapse=~/.hgext/collapse.py
hgext.purge=
hgext.extdiff=
hgext.graphlog=

[extdiff]
cmd.diffmerge=/usr/bin/diffmerge

[merge-tools]
diffmerge.executable=/usr/bin/diffmerge
diffmerge.args= --result=$output -t1="Local Version" -t2=$output -t3="Other Version" --caption=$output $local $base $other
diffmerge.binary=False
diffmerge.symlinks=False
diffmerge.gui=True
diffmerge.premerge=True
+5
source share
1 answer

I suppose you mean that you are using SourceGear DiffMerge as an external merge tool. What is yours .hgrc? Is it based on a sample from the hg website ?

I assume yours is diffmerge.argsproblematic. You can try running diffmerge manually with these arguments to make sure it works.

.hgrc . hg diffmerge -r 32 -r 30 myfile , hg diffmerge ( [extdiff]), myfile 32 30. .

hg merge [-r<the other head>], .hgrc hg diffmerge ( [ui]), hg diffmerge 3-way merge. , Windows hgrc.

+3

More articles:


All Articles