| commit | 8280baf565e1c72adaa6d2dfef70d18837126898 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2011 23:12:48 +0000 (26 16:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2011 23:12:48 +0000 (26 16:12 -0700) | ||
| tree | 150aed0a0d12803bc306c5d77d59ae135faa14b5 | treesnapshot (tar.gz zip) |
| parent | 58f75bcf323e86067147ac66bbb493e6a8c2631f | commitdiff |
| parent | 852844561e8daaa6689cab48a725f764ad5779cb | commitdiff |
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
* mh/maint-notes-merge-pathbuf-fix:
notes_merge_commit(): do not pass temporary buffer to other function