Code

Merge branch 'mh/maint-notes-merge-pathbuf-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:20 +0000 (15:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2011 22:56:20 +0000 (15:56 -0700)
commite579a5d398744e8182decff1329c468d59e6974c
treef23b42a3337fbbbb2b4e0fb1bb3a25dbf4d4dbaf
parentbf604e64fb505738eff2ef7b347635fcd93b776f
parent852844561e8daaa6689cab48a725f764ad5779cb
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
notes-merge.c