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

[Dedeco]

>  That the conflict occurs is OK. The problem is that the merged file 
> contains <<<<<< all of FILE.THIS ====== all of FILE.OTHER
I have used the /Meld/ program to handle conflicts. It is good. (I run 
it on linux, though)

But for your problem this might not be the solution.

See the /uncommit/ command. When you see a commit (the last one!) with 
wrong line endings causing conflicts, undo it, fix the lines and 
recommit. *Be very carefull**with more than one revision uncommit and 
with conflicts.*

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20121210/33fe0864/attachment.html>