Merge branch 'jn/maint-commit-missing-template' into maint

author Junio C Hamano <gitster@pobox.com>

Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)

committer Junio C Hamano <gitster@pobox.com>

Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
author Junio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
committer Junio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
diff --cc builtin/commit.c
Simple merge
diff --cc t/t7500-commit.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
		1	2
builtin/commit.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t7500-commit.sh	patch \|	diff1 \|	diff2 \|	blob \| history