diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 17:52:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 17:52:16 (GMT) |
| commit | 6c252ef79e314eef8fca862cca8a63329fa7591c (patch) | |
| tree | 0d78f94339a811b18905a594a257dd003cb52ce2 /diff.h | |
| parent | 2da61dcf9e678f36f8287b2cacdec2ebf014ae69 (diff) | |
| parent | 0a0ec7bd66786bcc2204f299f6c993db19d1f53c (diff) | |
| download | git-6c252ef79e314eef8fca862cca8a63329fa7591c.zip git-6c252ef79e314eef8fca862cca8a63329fa7591c.tar.gz git-6c252ef79e314eef8fca862cca8a63329fa7591c.tar.bz2 | |
Merge branch 'cj/p4merge'
* cj/p4merge:
Pass empty file to p4merge where no base is suitable.
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions