From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:12:48 +0000 (-0700)
Subject: Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6
X-Git-Tag: v1.7.8-rc0~7^2~4^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8280baf565e1c72adaa6d2dfef70d18837126898;p=git.git

Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6

* mh/maint-notes-merge-pathbuf-fix:
  notes_merge_commit(): do not pass temporary buffer to other function
---

8280baf565e1c72adaa6d2dfef70d18837126898