Merge branch 'jc/apply-fix-mismerge' into maint
commit34a75ccb1dade147f404c0841c3f1ec777c0a97a
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:59 +0000 (4 10:20 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:59 +0000 (4 10:20 +0900)
tree510b420cb094401461673c76cf4117cfa2f31b74
parent0501b7e78564d11e87d228f7ffdbdb4b147145e3
parente294e8959fea043225a023f981121540b14b08cd
Merge branch 'jc/apply-fix-mismerge' into maint

Mismerge fix.

* jc/apply-fix-mismerge:
  apply.c: fix whitespace-only mismerge
apply.c