On Sun, Oct 21, 2012 at 02:54:06PM -0400, Richard Hipp wrote: > In the change above, there is no explicit "resolve" step. Fossil > automatically senses whether or not you have resolved the conflict through > editing.
I think that the change misses one of the most valuable situations - those of binary files conflict, where comitting directly after merge would destroy any evidence of conflict. I got that by a quick glance at the patch though; I may have missed something. Regards, Lluís. > You can get rid of those extra files with the new --temp option to the > "fossil clean" command: "fossil clean --temp" That's a nice option! :) Thank you! _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
