Code

Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:48 +0000 (16:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:48 +0000 (16:12 -0700)
commit8280baf565e1c72adaa6d2dfef70d18837126898
tree150aed0a0d12803bc306c5d77d59ae135faa14b5
parent58f75bcf323e86067147ac66bbb493e6a8c2631f
parent852844561e8daaa6689cab48a725f764ad5779cb
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