| commit | 0af69bb8f19d3fdca03f0401f168b10fa5132fdc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:41:56 +0000 (6 15:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:41:56 +0000 (6 15:41 -0700) | ||
| tree | 36c7cdd69d1808d83a0769eb23806575f3c9cc1c | treesnapshot (tar.gz zip) |
| parent | f6b8355f7f66ff9ddae50417da9cebe185aa4dfe | commitdiff |
| parent | 852844561e8daaa6689cab48a725f764ad5779cb | commitdiff |
Merge branch 'mh/maint-notes-merge-pathbuf-fix' into next
* 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
| notes-merge.c | diff1 | diff2 | blobhistory |