From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Jun 2017 01:20:59 +0000 (+0900)
Subject: Merge branch 'jc/apply-fix-mismerge' into maint
X-Git-Tag: v2.13.1~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/34a75ccb1dade147f404c0841c3f1ec777c0a97a?hp=--cc

Merge branch 'jc/apply-fix-mismerge' into maint

Mismerge fix.

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

34a75ccb1dade147f404c0841c3f1ec777c0a97a