On Tue, Nov 28, 2006 at 07:43:51AM -0500, [EMAIL PROTECTED] wrote:
>
> Which suggests one option is to
> * recognise line-ends of any variety
> * ignore the line-end type when merging lines
> * but then, for lines that haven't changed except for line ending,
I mean, lines that got line-ending-converted on checkout
> restore the original line-endings so that the differences don't
> become excessive.
> This does require that the merge have some idea of which is the
> "original" and which is the "changes".
>
> -- hendrik
_______________________________________________
Monotone-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-devel
