From: Junio C Hamano Date: Mon, 01 Apr 2013 19:57:16 GMT Subject: [PATCH 0/3] Merging an annotated tag object Message-ID: <1364846239-8802-1-git-send-email-gitster@pobox.com> In-Reply-To: <7v7gl3jmx0.fsf_-_@alter.siamese.dyndns.org> 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