On Thu, Mar 5, 2009 at 11:16 AM, <[email protected]> wrote: > On Thu, Mar 05, 2009 at 09:57:06AM -0800, Zack Weinberg wrote: >> I'm not actually sure whether the default three-way content merge is >> line-oriented or byte-oriented. > > Would the following be an effective test? > > A > / \ > / \ > B C > > where B and C involve changes in different parts of the same line, and > then try to merge B and C to see if there's a merge conflict?
Yeah, I think so. Before you go and add stuff to the test suite, please look through the existing set of Lua testcases with "merge" in their name. It might already be there. (I'll hand out fabulous no-prizes for fixing existing xfailed tests... ;-) zw _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
