Merge branch 'rs/diff-ihc'

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

Conflicts:
	Documentation/diff-options.txt

diff --cc Documentation/diff-options.txt
index b432d2518aba3d1be9d86fb1613bbe2f5fa9da4d,c7fcc8007af18163d7d1583e116b625b54d428ca..671f533ca30c1fb0ddae8a15f9c586c431c8fef5
--- 1/Documentation/diff-options.txt
--- 2/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -205,6 -212,13 +205,10 @@@ endif::git-format-patch[
        differences even if one line has whitespace where the other
        line has none.
  
 --w::
 -      Shorthand for "--ignore-all-space".
 -
+ --inter-hunk-context=<lines>::
+       Show the context between diff hunks, up to the specified number
+       of lines, thereby fusing hunks that are close to each other.
+ 
  --exit-code::
        Make the program exit with codes similar to diff(1).
        That is, it exits with 1 if there were differences and

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc diff.c
Simple merge