Merge branch 'jk/diff-no-index-pager'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2012 22:19:11 +0000 (15:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2012 22:19:11 +0000 (15:19 -0700)
"git diff --no-index" did not work with pagers correctly.

1  2 
builtin.h

diff --cc builtin.h
Simple merge