diff options
Diffstat (limited to 't/t6020-merge-df.sh')
| -rwxr-xr-x | t/t6020-merge-df.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh index bc9db1a0f0..7b1ce82707 100755 --- a/t/t6020-merge-df.sh +++ b/t/t6020-merge-df.sh @@ -71,7 +71,7 @@ test_expect_success 'setup modify/delete + directory/file conflict' ' git commit -m deleted ' -test_expect_failure 'modify/delete + directory/file conflict' ' +test_expect_success 'modify/delete + directory/file conflict' ' git checkout delete^0 && test_must_fail git merge modify && |