diff options
Diffstat (limited to 't/t6020-merge-df.sh')
| -rwxr-xr-x | t/t6020-merge-df.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh index 490d397114..5d91d056d2 100755 --- a/t/t6020-merge-df.sh +++ b/t/t6020-merge-df.sh @@ -20,7 +20,9 @@ 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_success 'F/D conflict' ' git reset --hard && |