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

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12-12-09 03:14 AM, Fredrik Staxeng wrote:
> If anybody has done this, I would be very grateful for any details 
> that you can tell me. Which version of diff3, perhaps where to get
> it, and how get bazaar to use it.

As far as I know, all versions of diff3 work.  You tell merge to use
it by specifying --diff3 to "bzr merge".  If you want to standardize
on diff3, I recommend aliasing "merge" to "merge --diff3", e.g. "bzr
alias merge=merge\ --diff3"

Aaron

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iEYEARECAAYFAlDGRSsACgkQ0F+nu1YWqI0TOwCfYY6vanOBOx55+rT+6+s4bGsd
QWYAnAijtQ3+IKjZPWNoJ0FgB81cY76s
=bVCH
-----END PGP SIGNATURE-----