Merge branch 'jk/diff-no-index-pager' into maint
authorJunio C Hamano <redacted>
Wed, 11 Jul 2012 19:46:21 +0000 (12:46 -0700)
committerJunio C Hamano <redacted>
Wed, 11 Jul 2012 19:46:21 +0000 (12:46 -0700)
"git diff --no-index" did not work with pagers correctly.

* jk/diff-no-index-pager:
  do not run pager with diff --no-index --quiet
  fix pager.diff with diff --no-index

1  2 
builtin.h

diff --cc builtin.h
Simple merge
git clone https://git.99rst.org/PROJECT