https://bugzilla.novell.com/show_bug.cgi?id=473776
User agruen@novell.com added comment
https://bugzilla.novell.com/show_bug.cgi?id=473776#c8
--- Comment #8 from Andreas Gruenbacher
1 2 <<<<<<< c 3c ||||||| a 3 ======= 3b
>> b 4 5 <<<<<<< a 6 ======= 6bc >> b 7 8
I find this rather irritating because it's not immediately obvious what the proposed merge result is: the second file is shown below ||| in the first conflict, but below <<< in the second; the proposed merge result (?) is shown below <<< in the first and below === in the second conflict. To make the format easier to read, my best idea so far is to change the order in which files are shown so that the proposed merge result always comes last, e.g., <<<<<<< a original version ||||||| b new version in patch ======= merge result
>
or <<<<<<< a original version ======= merge result == new version in patch
> b
Wiggle handles the apply-apply situation more gracefully than diff3: $ wiggle -m c ab.diff
1 2 <<<<<<< 3c ||||||| 3 ======= 3b
>> 4 5 6bc 7 8 1 unresolved conflict found 1 already-applied change ignored
I'm not sure whether it is generally safe to ignore apply-apply conflicts; I'm leaning towards marking them. (Similar to my preference for at least optionally marking differences in context.) Any thoughts? -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.