Merge branch 'jc/apply-fix-mismerge' into maint
Mismerge fix. * jc/apply-fix-mismerge: apply.c: fix whitespace-only mismerge
Junio C Hamano committed
Jun 4, 2017 at 10:20 UTC
34a75ccb1dade147f404c0841c3f1ec777c0a97a
No changes.