X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4151-am-abort.sh;h=b55c4117884744db8eda17e42fe05e0e65216215;hb=d7cc7c971f58091a2f2a15d2dca0fab0bd2ca310;hp=2b912d77283fbd3fc02a7d9d6bca660e4193b8c3;hpb=58066bec5a2cd8f5b6bb4884c8162364374ba0c1;p=git.git diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 2b912d772..b55c41178 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -47,7 +47,7 @@ do test_must_fail git am$with3 --skip >output && test "$(grep "^Applying" output)" = "Applying: 6" && test_cmp file-2-expect file-2 && - test ! -f .git/rr-cache/MERGE_RR + test ! -f .git/MERGE_RR ' test_expect_success "am --abort goes back after failed am$with3" ' @@ -57,7 +57,7 @@ do test_cmp expect actual && test_cmp file-2-expect file-2 && git diff-index --exit-code --cached HEAD && - test ! -f .git/rr-cache/MERGE_RR + test ! -f .git/MERGE_RR ' done