Heh, you are too cautious ;-)
Both "log --merge" and mergetool have been with us for quite some time,
and I certainly do not mind taking [2/2] if not both.
--
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