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)
* mh/maint-notes-merge-pathbuf-fix:
  notes_merge_commit(): do not pass temporary buffer to other function

1  2 
notes-merge.c

diff --cc notes-merge.c
Simple merge