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

[Thorsten Glaser]

On Tue, 11 Dec 2012, Frits Jalvingh wrote:

> you really need to do if you also decide to start bazaar line endings
> support (using a rules file). In that case it is pretty much mandatory that

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.

> 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.

> > This is all you need to know about vi: ESC : q ! RET

*agree*

^X^C does the trick for Emacs, just for completeness,
and ^Xn for pico. *shudder*

Anyway, again: http://www.afaik.de/usenet/faq/zitieren/
with translations linked on that page.

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-314
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Boris Esser, Sebastian Mancke