diff options
Diffstat (limited to 't/t4017-diff-retval.sh')
| -rwxr-xr-x | t/t4017-diff-retval.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh index 0b379c307b..ed461f481e 100755 --- a/t/t4017-diff-retval.sh +++ b/t/t4017-diff-retval.sh @@ -2,7 +2,7 @@ test_description='Return value of diffs' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -114,7 +114,7 @@ test_expect_success 'check detects leftover conflict markers' ' git checkout HEAD^ && echo binary >>b && git commit -m "side" b && - test_must_fail git merge master && + test_must_fail git merge main && git add b && test_expect_code 2 git --no-pager diff --cached --check >test.out && test 3 = $(grep "conflict marker" test.out | wc -l) && |