diff options
Diffstat (limited to 't/t7605-merge-resolve.sh')
| -rwxr-xr-x | t/t7605-merge-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh index 2f80037c9a..5d56c38546 100755 --- a/t/t7605-merge-resolve.sh +++ b/t/t7605-merge-resolve.sh @@ -43,7 +43,7 @@ merge_c1_to_c2_cmds=' test_expect_success 'merge c1 to c2' "$merge_c1_to_c2_cmds" -test_expect_failure 'merge c1 to c2, again' "$merge_c1_to_c2_cmds" +test_expect_success 'merge c1 to c2, again' "$merge_c1_to_c2_cmds" test_expect_success 'merge c2 to c3 (fails)' ' git reset --hard c2 && |