Merge branch 'cj/p4merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:44:46 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:44:46 +0000 (10:44 -0700)
* cj/p4merge:
  Pass empty file to p4merge where no base is suitable.


Trivial merge