merge: fix incorrect merge message for ambiguous tag/branch
authorJeff King <peff@peff.net>
Sun, 9 Aug 2009 10:02:24 +0000 (06:02 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Aug 2009 19:34:20 +0000 (12:34 -0700)
commit751c597...6c7522982214528eb653dfb61d372257
tree7be0dd9...9eaef7dc37804527402533050ba72491copy hash to clipboard (tree)
parentce06461...4696ae6d87c0e243d058cf5df6459c4fcopy hash to clipboard (diff)
builtin-merge.c
t/t4202-log.sh
t/t7608-merge-messages.sh