How to configure Mercurial to use Kompare when merging?

I've tried adding merge=kompare to my ~/.hgrc, but when I run hg merge, it runs kompare, but there's no UI to开发者_如何学Go be seen. Hg says merging path/to/first-file and stays there, actionless.

The kompare.args posted earlier probably wont work. I've had difficulty using Kompare for merging, especially 3-way merges (which are preferred and safe). BTW, most of the other options are enabled by default I believe, but you can verify with: hg showconfig merge-tools

You are better off using kdiff3. Incase you are on Ubuntu Intrepid, kdiff3 was erroneously removed from the repos - but you can easily compile from source.

You will also need to add a section that explains how to call Kompare. I don't know Kompare, so I don't know what the command line should look like (no guarantees for the kompare.args line), but it should be something like this:

[merge-tools]
kompare.executable = C:\<path...>\kompare.exe
kompare.args = $base $local $other -o $output
kompare.priority = 1
kompare.gui = True
kompare.binary = True

If merges aren't detected correctly, you might want to add

kompare.checkconflicts = True
kompare.checkchanged = True

Kompare does not support 3-way diffs, so it can be used for Visual Diff feature only. Here's the config to make it work:

[merge-tools]
kompare.executable = kompare
kompare.diffargs = -c $parent $child
kompare.gui = True

Note the diffargs field instead of args.