That actually looks exactly like it should. The order of the windows that vimdiff uses is (IIRC): ours, on-disk file, theirs. "Seth House" <seth@xxxxxxxxx> wrote: >David Aguilar <davvid <at> gmail.com> writes: >> What happens if you remove this section?: > >Same result. The conflict markers are still there: > >http://i.imgur.com/d1vp1.png > >-- >To unsubscribe from this list: send the line "unsubscribe git" in >the body of a message to majordomo@xxxxxxxxxxxxxxx >More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
