merge: notice local merging of tags and keep it unwrapped
authorJunio C Hamano <gitster@pobox.com>
Sat, 5 Nov 2011 04:31:28 +0000 (21:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Nov 2011 22:06:39 +0000 (14:06 -0800)
commit57b58db...4c3272ac13d5d201ecedf6483b34cdfe
treeb530170...cf23a0ebd9a02e01ffb63c41d0a6b3fecopy hash to clipboard (tree)
parent7a2b128...13d880635e7317a9208cfa42a660f143copy hash to clipboard (diff)
builtin/merge.c
t/t4202-log.sh
t/t7600-merge.sh
t/t7604-merge-custom-message.sh
t/t7608-merge-messages.sh