author | Junio C Hamano <gitster@pobox.com> | |
Mon, 10 Oct 2011 22:56:20 +0000 (15:56 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 10 Oct 2011 22:56:20 +0000 (15:56 -0700) | ||
commit | e579a5d398744e8182decff1329c468d59e6974c | |
tree | f23b42a3337fbbbb2b4e0fb1bb3a25dbf4d4dbaf | tree | snapshot |
parent | bf604e64fb505738eff2ef7b347635fcd93b776f | commit | diff |
parent | 852844561e8daaa6689cab48a725f764ad5779cb | commit | diff |
Merge branch 'mh/maint-notes-merge-pathbuf-fix'
* 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 | | blob | history |