Bob needs help to merge

dave p. guandalino guandalino at gmail.com
Fri Feb 4 03:54:00 CST 2011


Hi, thanks to all of you for the prompt replies. The problem still persists.

2011/2/3 Martin Geisler <mg at aragost.com>:
> Yes, it should. The problem is that kdiff3 is started with the filenames
> in the wrong order, so the output pane (the bottom pane) is not
> connected to the right file. I have this config in my config file:
>
>  [merge-tools]
>  kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
>  kdiff3.regkey=Software\KDiff3
>  kdiff3.regappend=\kdiff3.exe
>  kdiff3.fixeol=True
>  kdiff3.gui=True
>  kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child

This is the relevant output of hg showconfig --debug about the merge thing:

C:\Programs\Mercurial\mercurial.ini
merge-tools.kdiff3.args=--auto --L1 base --L2 local --L3 other $base
$local $other -o $output
merge-tools.kdiff3.regkey=Software\KDiff3
merge-tools.kdiff3.regappend=\kdiff3.exe
merge-tools.kdiff3.fixeol=True
merge-tools.kdiff3.gui=True
merge-tools.kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child

C:\Documents and Settings\myuser\mercurial.ini
ui.merge=C:\Programs\KDiff3\kdiff3.exe

Being C:\Programs\Mercurial\mercurial.ini a per-installation/system
configuration file and considering that settings configured there are
not overwritten elsewhere, this configuration should be OK.

I've also tried to change merge tool (DiffMerge) to see if something
changed, with no luck.

Need to solve this! Many thanks.


More information about the Mercurial mailing list