On 5/7/16, Joel Bruick <j...@joelface.com> wrote: > > This branch fixes a couple of merge tests that currently fail (marked as > "knownBug") in trunk, and the tests I've added cover every situation I > could think of to trip up the merge command. If there's anything I've > overlooked or need to improve/clarify, please let me know. Thanks!
Thanks for working this out. It looks good so far. But I'm going to test on it some more before merging, if you don't mind. Gimme another 24 hours. Maybe 48. -- D. Richard Hipp d...@sqlite.org _______________________________________________ fossil-dev mailing list fossil-dev@mailinglists.sqlite.org http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev
