From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 May 2017 02:51:59 +0000 (+0900)
Subject: Merge branch 'jc/apply-fix-mismerge'
X-Git-Tag: v2.14.0-rc0~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afc5f2ce63be2a51b1f87467065e47c398468c9e;p=git

Merge branch 'jc/apply-fix-mismerge'

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

afc5f2ce63be2a51b1f87467065e47c398468c9e