Code

Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:48 +0000 (16:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:12:48 +0000 (16:12 -0700)
* mh/maint-notes-merge-pathbuf-fix:
  notes_merge_commit(): do not pass temporary buffer to other function


Trivial merge