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

[Aaron Bentley]

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

On 12-12-12 10:43 AM, Aaron Bentley wrote:
> On 12-12-11 11:39 PM, Fredrik Staxeng wrote:
>> , and the line endings has changed in a file, the result is a 
>> "merged" file that consists of the whole of f.THIS, followed by
>> the whole of f.OTHER.
> 
>> You can fix this after the fact using gnuwin32 diff. Put this in
>> a bat file

> So if gnuwin32 diff3 is fixing your line endings, you should be
> able to use the --diff3 flag to use it.  Is there a problem with
> doing that?

Oh, and for doing it after the fact, you could also use bzr remerge
- --diff3.

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

iEYEARECAAYFAlDIqBwACgkQ0F+nu1YWqI1oKACff4qEMpafzRzBAvJrCZCeZYcM
hSoAnAoMC6BT0GMWIgRAFYtm4oeztx+O
=tv5E
-----END PGP SIGNATURE-----