Extra carriage return added on resolve merge

[malcolmstorm]

We are using Vault 4.1.3 and the included DiffMerge 3.2. We are encountering an annoying problem that when two versions of a file are needing merge, on resolving the merge an extra carriage return linefeed is added to the merged solution. I have turned on the whitespace and extra character view and can see that the two versions of the file do not have a final carriage return but as soon as the merge is resolved the merged version does. This means that as soon as we reformat our code (using resharper templates) the carriage return is removed again and a change is detected that really should not be there. This adds more merge possiblities and checkin differences to investigate.

This problem while sounding small adds time on most checkins that is adding up considerably and we are at the point of switching to another merge tool that will not have this problem. We have been using Diffmerge for the last 4 years so we would prefer not to.

Any suggestions / fixes?

[jeffhostetler]

Look in the DiffMerge Options dialog on the "File Windows" page.
There's a checkbox labeled "Require Final EOL when Saving Files".

Uncheck it and see if they problem goes away.

jeff

[malcolmstorm]

Ahh, I missed that setting! We have now tested it and it works as we wish it to. That is a great relief thanks.