On 31/05/18 10:22, Richard Hipp wrote: > On 5/31/18, Richard Hipp <d...@sqlite.org> 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. > > Thanks Richard. I will do it this weekend.
Cheers, Offray _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
