Skip to content

Commit dd475c6

Browse files
committed
TO-RESOLVE
This reflects the merge conflict resolutions with the previous merge commit as rebased from Git for Windows' `master` on top of upstream. Once the conflicting patch series make it to an official Git version, Git for Windows' `master` will need to take these merge conflict resolutions in a more permanent way. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 9366b35 commit dd475c6

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

t/README

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,6 @@ the --no-sparse command-line argument.
384384
GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
385385
by overriding the minimum number of cache entries required per thread.
386386

387-
GIT_TEST_REBASE_USE_BUILTIN=<boolean>, when false, disables the
388-
builtin version of git-rebase. See 'rebase.useBuiltin' in
389-
git-config(1).
390-
391387
GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
392388
builtin version of git add -i. See 'add.interactive.useBuiltin' in
393389
git-config(1).

0 commit comments

Comments
 (0)