diff options
| -rwxr-xr-x | t/t4200-rerere.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 1a080e782..8f5f268ba 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -446,6 +446,8 @@ merge_conflict_resolve () { } test_expect_success 'multiple identical conflicts' ' + rm -fr .git/rr-cache && + mkdir .git/rr-cache && git reset --hard && test_seq 1 6 >early && |