Merge branch 'ae/better-template-failure-report' into next
commit3b269c9d9fc2ffa2cc71602209f1d1a7245ff725
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Feb 2011 22:16:17 +0000 (3 14:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Feb 2011 22:16:17 +0000 (3 14:16 -0800)
treea312c6d594e2e2cfbd253402bb47132adb0d2d06
parent1c10f1616bfc43eabab98c733658715b7d90f879
parent6cf6bb3e47ac2f667fa0b27a4222e903ff6fb77c
Merge branch 'ae/better-template-failure-report' into next

* ae/better-template-failure-report:
  Improve error messages when temporary file creation fails
Makefile