diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-10 15:56:20 -0700 |
| commit | e579a5d398744e8182decff1329c468d59e6974c (patch) | |
| tree | f23b42a3337fbbbb2b4e0fb1bb3a25dbf4d4dbaf /git-merge-resolve.sh | |
| parent | bf604e64fb505738eff2ef7b347635fcd93b776f (diff) | |
| parent | 852844561e8daaa6689cab48a725f764ad5779cb (diff) | |
| download | git-e579a5d398744e8182decff1329c468d59e6974c.tar.gz | |
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
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions