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

[John Arbash Meinel]

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

...

> 
>> The work on this still in progress, but you can use external diff
>> tool
> ----------------------------------
>> (e.g. GNU diff3) in the ignore line-endings mode for merge.
> -----------------------------------------------------------
> 
> https://lists.ubuntu.com/archives/bazaar/2009q1/053994.html
> 

Offhand, I would guess you would do this by using the .OTHER, .THIS,
.BASE files that bzr puts in the directory whenever it gets a merge
conflict. .THIS was the test that existed in the directory before the
merge, .OTHER was the text we were merging, and .BASE is what bzr
determined to be the common ancestor.

I don't know diff3 syntax very well.

However, I don't think this is something you can just tell bzr to use
diff3, it is an after-merge-conflict step.

Alternatively, bzr does have the ability to have a plugin provide a
per-file merge hook (which you can say applies to all files).

I don't remember all the syntax for it, but there is:
  bzrlib/plugins/news_merge/

Which you can use as an example.

John
=:->

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

iEYEARECAAYFAlDEVYQACgkQJdeBCYSNAAME0wCggI5SjKgI9E7BMoAYLllYekcJ
nJcAn3JkbzMpA/G2ZLxNDKuu30+FpBKK
=c1iU
-----END PGP SIGNATURE-----