Re: Strange merge output.

Vincent Bernardi writes: > Hi, > I asked about this problem on #git@freenode and someone suggested I > submit it to this list. I have a case where the output of a merge > gives a conflict and produces the following file: > > Code Block A > <<< HEAD > === > Code Block B branch-B >

Strange merge output.

Hi, I asked about this problem on #git@freenode and someone suggested I submit it to this list. I have a case where the output of a merge gives a conflict and produces the following file: Code Block A <<< HEAD === Code Block B >>> branch-B Code Block B' (similar to code block B but n