>Can it be a difference on the end of lines? Hm, I don't know actually. There is small possibility that one can be with Linux LF and other with CRLF. Is it important? - they are text files and Fossil merges text files, not binaries.
---------- Original Message ---------- To: ([email protected]) From: Lluís Batlle i Rossell ([email protected]) Subject: Re: [fossil-users] Strange merge conflicts. Date: 4.3.2011 18:19:25 >On Fri, Mar 04, 2011 at 06:18:11PM +0200, John Found wrote: >> 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? >Can it be a difference on the end of lines? >_______________________________________________ >fossil-users mailing list >[email protected] >http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users 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
