Merge branch 'rs/diff-ihc'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:10:14 +0000 (00:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2009 08:10:14 +0000 (00:10 -0800)
commit7bb5321be0ecb70a990ad49da2a1366c19201372
tree82a8429e88beddb3b8bf8fb84aa39800670ae31d
parentff32340669a5521ca2b4b547b4853bfe22f60386
parent6d0e674a575421347abe5749e645ca6dc78c8207
Merge branch 'rs/diff-ihc'

* rs/diff-ihc:
  diff: add option to show context between close hunks

Conflicts:
Documentation/diff-options.txt
Documentation/diff-options.txt
contrib/completion/git-completion.bash
diff.c