merge: do not add standard message when message is given with -m option
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Dec 2009 18:00:58 +0000 (10:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Dec 2009 18:02:08 +0000 (10:02 -0800)
commitce9d823...9141756b5e60aa6c62653adb08e7213b
tree1fe3b07...a27499fc0dfb964d1bd84197424097cacopy hash to clipboard (tree)
parent76bf488...61b8a87191a1779b79820545e64ef275copy hash to clipboard (diff)
builtin-merge.c
t/t7604-merge-custom-message.sh