This is a patch I posted as an illustration, and then have been carrying in my tree a while, with some tests.
Junio C Hamano (3): merge: a random object may not necssarily be a commit t6200: use test_config/test_unconfig t6200: test message for merging of an annotated tag builtin/merge.c | 13 ++++++ t/t6200-fmt-merge-msg.sh | 100 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 81 insertions(+), 32 deletions(-) -- 1.8.2-480-g064f421 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
