HG merge tool adding random lines during merge.

[Mohammed, Khursheed]

Hello

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.

Thanks
Khursheed
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20090821/a3ee649b/attachment-0002.html>