3 test_description
='git merge
5 Testing a custom strategy.'
9 cat >git-merge-theirs
<<EOF
11 eval git read-tree --reset -u \\\$\$#
13 chmod +x git-merge-theirs
17 test_expect_success
'setup' '
26 git reset --hard c0 &&
34 test_expect_success
'merge c2 with a custom strategy' '
35 git reset --hard c1 &&
36 git merge -s theirs c2 &&
37 test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
38 test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
39 test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
40 test "$(git rev-parse c2^{tree})" = "$(git rev-parse HEAD^{tree})" &&
41 git diff --exit-code &&
42 git diff --exit-code c2 HEAD &&
43 git diff --exit-code c2 &&