diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:48 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:48 -0700 |
commit | 8280baf565e1c72adaa6d2dfef70d18837126898 (patch) | |
tree | 150aed0a0d12803bc306c5d77d59ae135faa14b5 /builtin.h | |
parent | 58f75bcf323e86067147ac66bbb493e6a8c2631f (diff) | |
parent | 852844561e8daaa6689cab48a725f764ad5779cb (diff) | |
download | git-8280baf565e1c72adaa6d2dfef70d18837126898.tar.gz git-8280baf565e1c72adaa6d2dfef70d18837126898.tar.xz |
Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6
* mh/maint-notes-merge-pathbuf-fix:
notes_merge_commit(): do not pass temporary buffer to other function
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions