ubuntu, conflicting merge, meld pops up
Uwe Brauer
oub at mat.ucm.es
Sun Nov 4 09:42:08 UTC 2018
Hi
I am on Ubuntu 16.04.
Whenever I run into a conflicting merge, the app meld pops up,
anybody knows where is the configuration of the merging app?
Hg showconfig
Shows
merge-tools.meld.gui=True merge-tools.meld.args=--label='local'
$local --label='merged' $base --label='other' $other -o $output
merge-tools.meld.check=changed merge-tools.meld.diffargs=-a
--label=$plabel1 $parent --label=$clabel $child
But there is no corresponding entry in my .hgrc file
I thought maybe there is a global one in etc, but it also does not
contain any reference to meld. I am puzzled.
Thanks
Uwe Brauer
More information about the Mercurial
mailing list