[PATCH] Issue #1325: use files' eol markers for conflict markers

Hi,

This patch changes our diff3 (merge) output to use the eol markers of one
of the merged files instead of the default platform eol marker. This is
an improvement to the diff library per se, and it also helps people who
don't set svn:eol-style. Avoiding inconsistent eol markers in many common
cases is a good thing, IMO, especially when it is nearly trivial to do.

I'm posting it here because it changes the output of the diff library.
OTOH, we don't document our eol handling and the new behaviour is more
helpful IMO.

(I choose to use the eol character of the first line of the 'modified'
file just because it sometimes is the "user's own" file. It is quite
arbitrary, but I had to chhose.)(

Objections?

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org