TO-RESOLVE

This reflects the merge conflict resolutions with `dscho/add-p` on top
of `pu`. Once the conflicting patch series make it to `master`, Git for
Windows' `master` will need to take these merge conflict resolutions in
a more permanent way.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

commit.h

@@ -295,7 +295,8 @@ int delayed_reachability_test(struct shallow_info *si, int c);
 void prune_shallow(unsigned options);
 extern struct trace_key trace_shallow;
 
-int interactive_add(int argc, const char **argv, const char *prefix, int patch);
+int interactive_add(int argc, const char **argv, const char *prefix,
+		    const char *patch_mode);
 int run_add_interactive(const char *revision, const char *patch_mode,
 			const struct pathspec *pathspec);
 

t/README

@@ -384,6 +384,10 @@ the --no-sparse command-line argument.
 GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
 by overriding the minimum number of cache entries required per thread.
 
+GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
+builtin version of git add -i. See 'add.interactive.useBuiltin' in
+git-config(1).
+
 GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading
 of the index for the whole test suite by bypassing the default number of
 cache entries and thread minimums. Setting this to 1 will make the