Reroll of previously sent mergetool enhancements. Now using -y as the short option for --no-prompt, but otherwise the same as before. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
