On Thu, Mar 3, 2016 at 12:11 PM, Stephan Beal <sgb...@googlemail.com> wrote: > Please update if at all possible. 1.33 is almost a year old, and the past 12 > months have seen lots of activity:
Yes, I'm updating. > My currently hypotheses is that you perhaps had an editor session active, > but unsaved, for one of the conflicting files. (i have done that once or > twice, and the result is similar to what you describe.) No, I'm sure about it. Could it be repo.cksum off? Luca _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
