I've got the canonical suture and rename examples working, and all other tests passing as well. See nvm.automate_show_conflict/tests/resolve_duplicate_name_conflict.
Now I'm working thru the emails from earlier discussions, implementing the other problematic use cases. I committed ss-mark-merge.text, multi-mark-merge.text, and unique-mark-merge.text to document the algorithms. -- -- Stephe _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
