On 5/31/18, Richard Hipp <[email protected]> wrote: > > Thanks for the bug report. Probably I should enhance Fossil so that > will successfully find the "pivot" (aka "most recent common ancestor") > without the use of timestamp information.
That fix is now on trunk. So if you rebuild your local Fossil using the latest sources, the merge should no just work - without having to correct the timewarp. -- D. Richard Hipp [email protected] _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
