"Stephen J. Turnbull" <[EMAIL PROTECTED]> writes: > > Yes, and i maintain that it is correct. Or you also maintain, that if > > a merge tool cleanly merges following, you would never use it? > > Yup. (Never is too strong, obviously if a project I pull from uses > Darcs, I'm kinda stuck with it.)
Note that "the following" is clean-merged with diff3, so you actually refuse to use most of the current version control systems? The difference is 2 extra lines (one common line would be enough though), which fool diff3 into adding more "section breaks" so it never notices the "conflict". I don't find that much better, just inconsistent with itself. See the "PPS" of my previous mail for diff3 -m output. Yours, Peter. -- Peter Rockai | me()mornfall!net | prockai()redhat!com http://blog.mornfall.net | http://web.mornfall.net "In My Egotistical Opinion, most people's C programs should be indented six feet downward and covered with dirt." -- Blair P. Houghton on the subject of C program indentation _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
