ubuntu, conflicting merge, meld pops up

[Uwe Brauer]

>>> "Christoph" == Christoph Giess <ch.giess at gmx.de> writes:

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

Does not exist!

But /usr/lib/python2.7/dist-packages/mercurial/default.d/mergetools.rc

Does.

No idea where it comes from because it is not part of my mercurial
mercurial-common installation, I installed via 
 http://ppa.launchpad.net/mercurial-ppa/releases/ubuntu xenial main

Very strange but thanks.

Uwe 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5025 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20181104/ef79c57a/attachment.p7s>