From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:21:35 +0000 (-0700)
Subject: Merge branch 'js/ignore-space-at-eol' into maint
X-Git-Tag: v2.9.3~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d;p=thirdparty%2Fgit.git

Merge branch 'js/ignore-space-at-eol' into maint

An age old bug that caused "git diff --ignore-space-at-eol"
misbehave has been fixed.

* js/ignore-space-at-eol:
  diff: fix a double off-by-one with --ignore-space-at-eol
  diff: demonstrate a bug with --patience and --ignore-space-at-eol
---

a52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d