whole file merged

[Matt Schulte]

On Wed, Oct 13, 2010 at 1:50 PM, Steve Borho <steve at borho.org> wrote:
> This usually caused by your merge tool saving the merged file with the
> wrong end-of-line markers.  KDiff3 is the typical perpetrator.
>
> Out of curiosity, can you run `hg showconfig merge-tools` and look for:
>
> merge-tools.kdiff3.fixeol = True

Ok I'm curious, I have merge-tools.kdiff3.fixeol = True.  What does this mean?

Matt Schulte