use external diff tool in the ignore line-endings mode for merge

[Frits Jalvingh]

> Hrm, is it really so difficult to produce LF line endings on Windows®
> or DOS? I mean, https://www.mirbsd.org/jupp.htm can easily do it, for
> example. And if you use e.g. Interix or, if it must be, Cygwin instead
> of GnuWin32 or MSYS, this should be easy.
>
I think that's the wrong question. Different OSes have different line
endings, and all native tools will default to the endings for that OS. Of
course lots of tools can be reconfigured to use something foreign - but
anyone that forgets will commit with wrong endings *and will not notice*.
Some other poor guy, having to do a merge, will find out the repo version
is bad later.
So saying "let the world adapt to the wrong behavior" is error-prone.


>
> > years ago. We are a Java shop, and solid rename support is a complete
> must
>
> Interesting, none of my coworkers usually have that problem, and they
> do Java™ as well.
>
Have what problem, with what? I meant to say bzr's rename support is
exemplary, automatic and almost flawless, which is not the case for git nor
for mercurial.

Greetings,
Frits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20121212/4c64de49/attachment-0001.html>