Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:33:30 +0000 (07:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:33:30 +0000 (07:33 -0800)
commitbc60f9f...7767f72d7ef73a4df536e199a3c13540
tree3ec2497...0110e61bb1ce802fc361fe5151cbf7fdcopy hash to clipboard (tree)
parent7842c44...cb89dc6c88e67bcc559bc9b38c617e0ccopy hash to clipboard (diff)
parent9bcbb1c...18d075d8b180cfef4c9089f868151e7ecopy hash to clipboard (diff)
builtin.h
builtin/fmt-merge-msg.c
builtin/merge.c