diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-16 05:51:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-16 05:51:59 +0300 |
| commit | afc5f2ce63be2a51b1f87467065e47c398468c9e (patch) | |
| tree | 5965af2e5aba72677949a6bde615a0934bf290b1 /archive-zip.c | |
| parent | 5cea6ffdf20b99388821fa1bc279da06835f5a0c (diff) | |
| parent | e294e8959fea043225a023f981121540b14b08cd (diff) | |
Merge branch 'jc/apply-fix-mismerge'
* jc/apply-fix-mismerge:
apply.c: fix whitespace-only mismerge
Diffstat (limited to 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions