Stephen Leake <[EMAIL PROTECTED]> writes: >>> >> I proposed a new process for resolving non-content conflicts; see >>> >> >>> >> http://lists.gnu.org/archive/html/monotone-devel/2008-04/msg00084.html >>> >> >>> >> Would that help? >>> > >>> > It looks like that would help >>> >>> good.
I've merged automate_show_conflicts into main; it provides just the 'automate show_conflicts' command. So people can start playing with it. I'll work on adding the required functionality in merge on the branch next. -- -- Stephe _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
