| commit | 6c95f535e909b91d3c8868f00196c85c61fe8142 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Nov 2012 03:31:40 +0000 (18 19:31 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Nov 2012 03:31:40 +0000 (18 19:31 -0800) | ||
| tree | 5b3e7cec784951a0acdb4c58caa8507cb2383cef | treesnapshot (tar.gz zip) |
| parent | 3424da1118786209f7ac41dd273e72a081421cd3 | commitdiff |
| parent | 3facc60031a5b860cae8cb26957e5b4e80820c34 | commitdiff |
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"
"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"