Merge branch 'rs/diff-ihc'
* rs/diff-ihc: diff: add option to show context between close hunks Conflicts: Documentation/diff-options.txt
Junio C Hamano committed
Jan 7, 2009 at 00:10 UTC
7bb5321be0ecb70a990ad49da2a1366c19201372
No changes.