SZEDER Gábor <szeder.dev@xxxxxxxxx> writes: > On Fri, Sep 28, 2018 at 06:24:53PM +0200, SZEDER Gábor wrote: >> Interdiff: >> diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh >> index c8acbc50d0..f053bf83eb 100755 >> --- a/t/t1700-split-index.sh >> +++ b/t/t1700-split-index.sh >> @@ -6,6 +6,9 @@ test_description='split index mode tests' >> >> # We need total control of index splitting here >> sane_unset GIT_TEST_SPLIT_INDEX > > The conflict resolution around here in 3f725b07d3 (Merge branch > 'sg/split-index-racefix' into jch, 2018-09-29) accidentally removed > the above line, ... Yeah, I see it in "git show --cc". Will fix the rerere database entry to prevent the mismerge from recurring.. Sorry, and thanks for helping me correcting the mismerge.
