Several times when making merge with fossil, I ended up with really strange conflicts like this:
<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<< include '%TargetOS%/mouse.asm'======= original content above; conflict below ============= include '%TargetOS%/mouse.asm'>>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>> In one merge, there was 4..5 similar "conflicts" and none of "real" In my opinion, both lines are totally equal. Is it a bug or I am missing something? Regards http://fresh.flatassembler.net Assembly language visual programming. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
