From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 17:52:16 +0000 (-0700)
Subject: Merge branch 'cj/p4merge'
X-Git-Tag: v1.7.6-rc0~98
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c252ef79e314eef8fca862cca8a63329fa7591c;p=git.git

Merge branch 'cj/p4merge'

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

6c252ef79e314eef8fca862cca8a63329fa7591c