Merge branch 'jc/apply-fix-mismerge'
* jc/apply-fix-mismerge: apply.c: fix whitespace-only mismerge
Junio C Hamano committed
May 16, 2017 at 11:51 UTC
afc5f2ce63be2a51b1f87467065e47c398468c9e
No changes.
* jc/apply-fix-mismerge: apply.c: fix whitespace-only mismerge
No changes.