Is merge broken with external merge tool kdiff3?

[Steve Borho]

On Thu, Apr 9, 2009 at 9:14 AM, Jeffrey A. Zelt <jeffreyz at broadpark.no> wrote:
> This post refers to the following:
>
> Mercurial 1.2.1
> kdiff3 0.0.95
> Ubuntu 8.10 Linux
>
>
> There seems to be something fishy with the way merges are handled with
> an external merge tool.  Excuse me if this has already been reported,
> but I started working with Mercurial only 3 days ago and I do not yet
> have a good overview.  In short, it does not work for me.

<snip>

Have a look at the mergetools.hgrc in the contrib directory of the mercurial
source.  What you describe is what you get if kdiff3 is not configured properly
as your merge tool.  You have to give it arguments, as described in that file.

--
Steve Borho