Follow-up Comment #2, bug #8549 (project monotone): This would be for example merge("rename a to b", "rename a to c") or merge("rename x to z", "rename y to z") and the like. Anything that causes a merge conflict when mark-merging the parent or name of a node_t.
_______________________________________________________ Reply to this item at: <http://savannah.nongnu.org/bugs/?8549> _______________________________________________ Message sent via/by Savannah http://savannah.nongnu.org/ _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel