From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2011 17:44:46 +0000 (-0700)
Subject: Merge branch 'cj/p4merge' into maint
X-Git-Tag: v1.7.5.2~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e82c74618b24ddaad56f085f66c90da7ad7a0cb5;p=git.git

Merge branch 'cj/p4merge' into maint

* cj/p4merge:
  Pass empty file to p4merge where no base is suitable.
---

e82c74618b24ddaad56f085f66c90da7ad7a0cb5