ubuntu, conflicting merge, meld pops up

[Christoph Giess]

Have a look at /etc/mercurial/hgrc.d/mergetools.rc

Regards,
 Christoph

On 04.11.18 10:42, Uwe Brauer wrote:
> 
> 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
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial