]>
git.ipfire.org Git - thirdparty/git.git/blob - t/t7605-merge-resolve.sh
3 test_description
='git merge
5 Testing the resolve strategy.'
9 test_expect_success
'setup' '
18 git reset --hard c0 &&
23 git reset --hard c0 &&
31 git reset --hard c1 &&
32 git merge -s resolve c2 &&
33 test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
34 test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
35 test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
36 git diff --exit-code &&
40 test 3 = $(git ls-tree -r HEAD | wc -l) &&
41 test 3 = $(git ls-files | wc -l)
44 test_expect_success
'merge c1 to c2' "$merge_c1_to_c2_cmds"
46 test_expect_success
'merge c1 to c2, again' "$merge_c1_to_c2_cmds"
48 test_expect_success
'merge c2 to c3 (fails)' '
49 git reset --hard c2 &&
50 test_must_fail git merge -s resolve c3