Thanks; applied.
It was originally meant to be "resolve undo conflicts" but the symbolic
name got too long with the last word.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html