On Friday 01 December 2006 07:41, Wink Saville wrote: > Alan Chandler wrote: > > On Friday 01 December 2006 07:06, Wink Saville wrote: > > > > Take a look in these two files - you should see conflict markers of the > > form <<<<<<<<<<<<<<<< > > some content > > ================ > > some other content > > That's what I thought but there isn't any "<<<<<" and git-diff also seems > to indicate no differences: This is at the limit of my understanding, but perhaps file permission problems could have been the cause (was also thinking white space - but to my recollection is that that DOES cause resolution markers) I think you'll have to wait for experts from the list to comment. -- Alan Chandler http://www.chandlerfamily.org.uk - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Fri Dec 01 19:11:31 2006
This archive was generated by hypermail 2.1.8 : 2006-12-01 19:15:14 EST