Merge branch 'jn/maint-commit-missing-template' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
* jn/maint-commit-missing-template:
  commit: error out for missing commit message template

1  2 
builtin/commit.c
t/t7500-commit.sh

Simple merge
Simple merge