Merge branch 'ae/better-template-failure-report' into maint
commita8e04ddf6e3fc444469e6f0f2f4690c04c0290ab
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2011 05:09:39 +0000 (20 22:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2011 05:09:39 +0000 (20 22:09 -0700)
tree6a00db96c1ac88e318bb379413743a95fe88076f
parentc3786c8472093ec01b73a71a56f405932044a67e
parent6cf6bb3e47ac2f667fa0b27a4222e903ff6fb77c
Merge branch 'ae/better-template-failure-report' into maint

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