Markus Wanner <[email protected]> writes:
> Or review > Stephen Leake's work and land that. If you are refering to the conflicts resolution stuff in nvm.resolve_conflicts, that has already been merged into main. That is _not_ the suture stuff in nvm.automate_show_conflict; that work is on hold indefinitely (ie, until I run into a situation that really needs it). -- -- Stephe _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
