Hi, I'd like to propose that we change our conflict marking to include the text from before the conflict as well as each of the possible conflicting results.
For example, if you have import Foo ( bar, baz ) and one patch changes this to import Foo ( bar ) and the other to import Foo ( bar, baz, blat ) then the conflict marks would give you v v v v v v v import Foo ( bar, baz ) ============= import Foo ( bar ) ************* import Foo ( bar, baz, blat ) ^ ^ ^ ^ ^ ^ ^ from which I think it's much easier to deduce the correct merge than the current situation (where the first bit up to the ==== is left out). The code change itself is trivial - I've been using it myself for a few weeks and been really happy with the result. Ganesh _______________________________________________ darcs-users mailing list darcs-users@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users
