whole file merged
Steve Borho
steve at borho.org
Thu Oct 14 14:27:57 UTC 2010
On Thu, Oct 14, 2010 at 2:13 AM, b b <borique at gmail.com> wrote:
> Thanks for reply.
>
> Yes I have merge-tools.kdiff3.fixeol = True. But as I understand it, it
> should be so.
>
> Is then the reason that the merged files did not the same EOL have? One of
> the merged file is mine but the second came from other person that could
> have other EOL than me.
> Do I have to check before I merge, if merged file the same EOL have?
You probably want to check the EOL after the merge, but even better
would be to fix this feature and then add a test for it.
--
Steve Borho
More information about the Mercurial
mailing list