diff options
author | Jay Soffian <jaysoffian@gmail.com> | 2010-07-14 21:18:11 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 00:04:25 +0400 |
commit | 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (patch) | |
tree | 5a6087ccd95cf00c8e23e8b325964ef78ca2046d /t | |
parent | 1b79d1c2a8a90419238f7213870ab1dc465082fe (diff) |
MERGE_RR is in .git, not .git/rr-cache
0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the
location of MERGE_RR but I found a few references to the old
location.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-x | t/t4151-am-abort.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 2b912d7728..b55c411788 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 |