Merge branch 'cj/p4merge'
* cj/p4merge: Pass empty file to p4merge where no base is suitable.
Junio C Hamano committed
May 6, 2011 at 10:52 UTC
6c252ef79e314eef8fca862cca8a63329fa7591c
No changes.
* cj/p4merge: Pass empty file to p4merge where no base is suitable.
No changes.