ubuntu, conflicting merge, meld pops up

[David Demelier]

Le 04/11/2018 à 16:01, Uwe Brauer a écrit :
> 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

Hi,

Check `hg showconfig merge-tools`. If you want something else, you can 
alter the priority in your .hgrc

Example:

[merge-tools]
vimdiff.priority = 100

Or you can also force a specific tool using

[ui]
merge = vimdiff

HTH

-- 
David