Merge branch 'js/ignore-space-at-eol' into maint
commita52fb9b8f3e30b5b5e743cae91c3b2e1f729eb5d
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:35 +0000 (8 14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:35 +0000 (8 14:21 -0700)
treee095fccfca6cd9d67981a5672f7f7df5629ad9cf
parent71076e11cda645c08f5c9f269e02ed28e47d5c4a
parent044fb190f75cdec35e56bde30ec214ab144311d9
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