From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Nov 2012 03:31:40 +0000 (-0800)
Subject: Merge branch 'da/mergetools-p4' into maint
X-Git-Tag: v1.8.0.1~21
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/6c95f535e909b91d3c8868f00196c85c61fe8142

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"
---

6c95f535e909b91d3c8868f00196c85c61fe8142