HG merge tool adding random lines during merge.

[Matt Mackall]

On Fri, 2009-08-21 at 12:01 -0600, Mohammed, Khursheed wrote:
> When merging many files from 2 repositories for integration build the
> merge tool, currently Kdiff3 or mercurial is adding extra lines into
> files that should not be part of the merge. This seems to be prevalent
> when a file gets renamed or moved in one of the repositories that is
> being merged from or too.

The --debug option might shed some light on your problem.

-- 
http://selenic.com : development and support for Mercurial and Linux