Hi, Stephen Leake wrote: > If you are refering to the conflicts resolution stuff in > nvm.resolve_conflicts, that has already been merged into main.
Oh, I missed that. Sorry for the noise, then. Regards Markus Wanner _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
