Merge branch 'lm/add-p-context' into seen

"git add/etc -p" now honors diff.context configuration variable,
and learns to honor -U<n> option.

* lm/add-p-context:
  add-patch: add diff.context command line overrides
  add-patch: respect diff.context configuration
  test: refactor to use "test_config"
  test: refactor to use "test_grep"

diff --cc Documentation/git-checkout.adoc
index ee83b6d9ba9a9b061ecf0b75bf5733c5bd75ca6a,896372fd7a2905cf62499cdcfefe5a8b933a0f77..40e02cfd6562ae939ce3ffd7d8454a2430cf7822
--- 1/Documentation/git-checkout.adoc
--- 2/Documentation/git-checkout.adoc
+++ b/Documentation/git-checkout.adoc
@@@ -289,7 -289,9 +289,9 @@@ section of linkgit:git-add[1] to learn 
  Note that this option uses the no overlay mode by default (see also
  `--overlay`), and currently doesn't support overlay mode.
  
 ---ignore-other-worktrees::
+ include::diff-context-options.adoc[]
+ 
 +`--ignore-other-worktrees`::
        `git checkout` refuses when the wanted branch is already checked
        out or otherwise in use by another worktree. This option makes
        it check the branch out anyway. In other words, the branch can

diff --cc Documentation/git-stash.adoc
Simple merge

diff --cc builtin/add.c
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/reset.c
Simple merge

diff --cc builtin/stash.c
Simple merge