diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 19:52:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 19:52:16 +0200 |
| commit | 6c252ef79e314eef8fca862cca8a63329fa7591c (patch) | |
| tree | 0d78f94339a811b18905a594a257dd003cb52ce2 /vcs-svn | |
| parent | Merge branch 'gr/cvsimport-alternative-cvspass-location' (diff) | |
| parent | Pass empty file to p4merge where no base is suitable. (diff) | |
| download | git-6c252ef79e314eef8fca862cca8a63329fa7591c.tar.xz git-6c252ef79e314eef8fca862cca8a63329fa7591c.zip | |
Merge branch 'cj/p4merge'
* cj/p4merge:
Pass empty file to p4merge where no base is suitable.
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions