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)
commite82c74618b24ddaad56f085f66c90da7ad7a0cb5
tree33f734238a21c6b5b4fba0bd7be832ae14dfda05
parent8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af
parent0a0ec7bd66786bcc2204f299f6c993db19d1f53c
Merge branch 'cj/p4merge' into maint

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