Junio C Hamano 7bb5321be0 Merge branch 'rs/diff-ihc' ... * rs/diff-ihc: diff: add option to show context between close hunks Conflicts: Documentation/diff-options.txt		2009-01-07 00:10:14 -08:00
..
git-completion.bash	Merge branch 'rs/diff-ihc'	2009-01-07 00:10:14 -08:00