Merge branch 'master' into sb/opt-filename
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2009 07:59:07 +0000 (00:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2009 07:59:07 +0000 (00:59 -0700)
commitee96969...c5e77e1b5ebda45bead569806d31b379
tree25d803c...17cbe891a9937f3e3442a1d7863ae773copy hash to clipboard (tree)
parent4c8d4c1...c6de59bc14d6118724ffee949e8654a7copy hash to clipboard (diff)
parent9619ff1...159ab3401636b9883a715b0f20b051dfcopy hash to clipboard (diff)
builtin-apply.c
builtin-fmt-merge-msg.c
t/t6200-fmt-merge-msg.sh