Merge branch 'js/ignore-space-at-eol'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:35 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:35 +0000 (14:13 -0700)
commitf2cfb8fcc993b77b0a0420a84fd1a9a48cbe0ab9
treec41fd869cc504b59f5c7c65feaea0fe457786344
parent87492cb24d9d8be8e18217b89ae5f090089ff31d
parent044fb190f75cdec35e56bde30ec214ab144311d9
Merge branch 'js/ignore-space-at-eol'

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