>Did it really come out looking like that, or did the line wrapping occur >when you pasted the output in to your email program? >
Not like in your response. But still strange. I posted 3 lines of text as a example. I will quote them again separateli, closed with "[]" in order to avoid mail client reformating: 1: [<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<] 2: [include '%TargetOS%/mouse.asm'======= original content above; conflict below =============] 3: [include '%TargetOS%/mouse.asm'>>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>] Possible one of the files could be in Linux format (line ending with $0a) and other in Windows ($0d,$0a) Also, possibly the last line of the file could not end with any of them. There is no whitespace at the end of the line, except for CR and LF. Best Regards. ---------- Original Message ---------- To: ([email protected]) From: Richard Hipp ([email protected]) Subject: Re: [fossil-users] Strange merge conflicts. Date: 4.3.2011 18:23:12 >On Fri, Mar 4, 2011 at 11:18 AM, John Found <[email protected]> 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 >> >>>>>>>>>>>>>>>>>> >> > >Did it really come out looking like that, or did the line wrapping occur >when you pasted the output in to your email program? > >Differences might be whitespace. Extra whitespace at the end of the line, >or tabs instead of spaces someplace. > >Or, could it be that your files does not end with a \n and that fact is >confusing Fossil somehow? If so, I'll look into it. But a quick fix for >you is to make sure your source code files end with \n - something you >should probably be doing anyhow. > > > >> >> 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 >> > > > >-- >D. Richard Hipp >[email protected] > > >--------------------------------------------- >_______________________________________________ >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
