diff options
Diffstat (limited to 't/t6028-merge-up-to-date.sh')
| -rwxr-xr-x | t/t6028-merge-up-to-date.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh index 824fca5b5b..c518e9c30c 100755 --- a/t/t6028-merge-up-to-date.sh +++ b/t/t6028-merge-up-to-date.sh @@ -79,7 +79,7 @@ test_expect_success 'merge -s subtree up-to-date' ' ' -test_expect_failure 'merge fast-forward octopus' ' +test_expect_success 'merge fast-forward octopus' ' git reset --hard c0 && test_tick && |