<html> <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> </head> <body bgcolor="#CCCCCC" text="#000000"> <div class="moz-cite-prefix"> </div> <blockquote cite="mid:1mk3srsfwt.fsf@Psilocybe.Update.UU.SE" type="cite"> That the conflict occurs is OK. The problem is that the merged file contains <<<<<< all of FILE.THIS ====== all of FILE.OTHER </blockquote> 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. </body> </html>