diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:31:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:31:40 -0800 |
| commit | 6c95f535e909b91d3c8868f00196c85c61fe8142 (patch) | |
| tree | 5b3e7cec784951a0acdb4c58caa8507cb2383cef /unpack-trees.h | |
| parent | Merge branch 'jc/test-say-color-avoid-echo-escape' into maint (diff) | |
| parent | mergetools/p4merge: Handle "/dev/null" (diff) | |
| download | tgif-6c95f535e909b91d3c8868f00196c85c61fe8142.tar.xz | |
Merge branch 'da/mergetools-p4' into maint
"git mergetool" feeds /dev/null as a common ancestor when dealing
with an add/add conflict, but p4merge backend cannot handle it. Work
it around by passing a temporary empty file.
* da/mergetools-p4:
mergetools/p4merge: Handle "/dev/null"
Diffstat (limited to 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions