Merge branch 'ae/better-template-failure-report' into next
commitd3f914259283fcca968e6fdd62bc46a4c3196204
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:05 +0000 (5 14:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:05 +0000 (5 14:25 -0800)
tree0011fc591493a6846da912a39cee91216d3d6109
parent3ccc5908aa6d3b77351475f8fc1aaf1a08ce3bd5
parent6cf6bb3e47ac2f667fa0b27a4222e903ff6fb77c
Merge branch 'ae/better-template-failure-report' into next

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