Merge branch 'js/patience-diff'

* js/patience-diff:
  bash completions: Add the --patience option
  Introduce the diff option '--patience'
  Implement the patience diff algorithm

Conflicts:
	contrib/completion/git-completion.bash

diff --cc Documentation/diff-options.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc contrib/completion/git-completion.bash
index 703f4c2e90b034a996d993632a81553de02ceda8,b98d765deb5294abddc24b1bc975c9d3b3c93a1d..81f70ec6449f3c15f26884040cdfe9e9cad489eb
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -782,20 -775,8 +782,21 @@@ __git_diff_common_options="--stat --num
                        --ignore-all-space --exit-code --quiet --ext-diff
                        --no-ext-diff
                        --no-prefix --src-prefix= --dst-prefix=
 -                      --base --ours --theirs
 +                      --inter-hunk-context=
+                       --patience
 +                      --raw
 +"
 +
 +_git_diff ()
 +{
 +      __git_has_doubledash && return
 +
 +      local cur="${COMP_WORDS[COMP_CWORD]}"
 +      case "$cur" in
 +      --*)
 +              __gitcomp "--cached --pickaxe-all --pickaxe-regex
 +                      --base --ours --theirs
 +                      $__git_diff_common_options
                        "
                return
                ;;

diff --cc diff.c
Simple merge

diff --cc xdiff/xdiff.h
Simple merge