diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:36 -0700 |
| commit | 4bd874c8f30d55b6189dacf1d769855ed2df4299 (patch) | |
| tree | b449d8155f4148e1afe5c7c9c99553bf85fcab14 /t | |
| parent | 4cd1b99c32d9a345438d098f37e75077d072778f (diff) | |
| parent | 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (diff) | |
| download | git-4bd874c8f30d55b6189dacf1d769855ed2df4299.tar.gz git-4bd874c8f30d55b6189dacf1d769855ed2df4299.tar.xz | |
Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix:
MERGE_RR is in .git, not .git/rr-cache
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 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 |