Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 21:46:29 +0000 (13:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 21:46:29 +0000 (13:46 -0800)
commitcf6c52f...e8bf0870069b630a2e199483f8f9faac
tree99a52b4...5c95f4a85316772425cf8ce173125b18copy hash to clipboard (tree)
parent44fe835...2edf5391bb3a5997cab01794b4568062copy hash to clipboard (diff)
parent9bcbb1c...18d075d8b180cfef4c9089f868151e7ecopy hash to clipboard (diff)
builtin.h
builtin/fmt-merge-msg.c
builtin/merge.c