Merge branch 'cj/p4merge' into maint
* cj/p4merge: Pass empty file to p4merge where no base is suitable.
Junio C Hamano committed
May 13, 2011 at 10:44 UTC
e82c74618b24ddaad56f085f66c90da7ad7a0cb5
No changes.
* cj/p4merge: Pass empty file to p4merge where no base is suitable.
No changes.