Merge branch 'cj/p4merge'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:16 +0000 (10:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:16 +0000 (10:52 -0700)
commit6c252ef79e314eef8fca862cca8a63329fa7591c
tree0d78f94339a811b18905a594a257dd003cb52ce2
parent2da61dcf9e678f36f8287b2cacdec2ebf014ae69
parent0a0ec7bd66786bcc2204f299f6c993db19d1f53c
Merge branch 'cj/p4merge'

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