Hello, in fossil 1.21, I've a modified openoffice file. Then I run "fossil update", and it tells me there is a merge conflict with a binary file, that it cannot merge.
What I'm surprised about is that fossil overwrites my local changes with the incoming ones. And the file with local changes disappears, only available again on 'fossil undo'. Should't fossil better leave additional files in the directory, as with the "-baseline", "-original", and "-merge"? Regards, Lluís. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
