Simon Marlow <[EMAIL PROTECTED]> writes: > Which reminds me - conflict markers are rather hard to use, because it's > not clear which change comes from which patch, and unless I'm mistaken the > order can vary from one file to another (perhaps even between hunks?).
Sounds scary. > Also, you don't get to see the original version of the file before either > patch. I'd like to see something like > > v v v v v v (original) > foo > =========== (patch A) > bar > =========== (patch B) > baz > =========== (patch C) > wibble > ^ ^ ^ ^ ^ ^ +1. Maybe with some even longer and clearer separator, like v v v v v v (original) foo =========== (original/patch A) bar =========== (patch A/patch B) baz =========== (patch B/patch C) wibble ^ ^ ^ ^ ^ ^ (patch C) -- Regards, Feri. _______________________________________________ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
