![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 17:52:16 +0000 (10:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 17:52:16 +0000 (10:52 -0700) | ||
| commit | 6c252ef79e314eef8fca862cca8a63329fa7591c | |
| tree | 0d78f94339a811b18905a594a257dd003cb52ce2 | tree | snapshot |
| parent | 2da61dcf9e678f36f8287b2cacdec2ebf014ae69 | commit | diff |
| parent | 0a0ec7bd66786bcc2204f299f6c993db19d1f53c | commit | diff |
Merge branch 'cj/p4merge'
* cj/p4merge:
Pass empty file to p4merge where no base is suitable.
* cj/p4merge:
Pass empty file to p4merge where no base is suitable.