whole file merged
steve at borho.org
Wed Oct 13 15:23:36 CDT 2010
On Wed, Oct 13, 2010 at 2:10 PM, Matt Schulte
<matts at commtech-fastcom.com> wrote:
> 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?
I added this feature to the file merge machinery just for kdiff3.
After the merge tool runs it checks the output file against the
original (local) file. If the EOLN was changed, it puts the original
EOLN on the new file.
The merge-tool config that ships with all Windows packages and most
Unix packages enables this feature for kdiff3, but there's been some
recent reports that it isn't working and I'm curious if it's a config
file problem or broken code.
More information about the Mercurial