diff options
Diffstat (limited to 't/t6020-merge-df.sh')
| -rwxr-xr-x | t/t6020-merge-df.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh index e71c687f2b..5d91d056d2 100755 --- a/t/t6020-merge-df.sh +++ b/t/t6020-merge-df.sh @@ -20,9 +20,11 @@ echo "file dir" > dir && git add dir && git commit -m "File: dir"' -test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master' +test_expect_success 'Merge with d/f conflicts' ' + test_expect_code 1 git merge "merge msg" B master +' -test_expect_failure 'F/D conflict' ' +test_expect_success 'F/D conflict' ' git reset --hard && git checkout master && rm .git/index && |