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

On Tue, 6 Dec 2005, Julian Foad wrote:

> Peter N. Lundblad wrote:
> >
> > Make our internal merge code use the 'modified' file for conflict markers.
>
> Mention "EOL style", and mention the issue:
>
...
> > This often gives consinstent line endings even when svn:eol-style is not
> > set on a file.
>
> "consistent" (sp.)
>

Yeah! These were to quick. Fixed.

> The patch looks good. Minor nit: diff_file.c seems not to use spaces before
> parentheses, but your added lines do.
>
Correct. Thanks. BTW, have I mentioned how much I really *hate* this
inconsistency in our code? Silly, but true. (And of course not your
fault, Julina:-)

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 7 09:57:50 2005