3 test_description
='cherry-pick should rerere for conflicts'
7 test_expect_success setup
'
9 test_commit foo-master foo &&
11 git checkout -b dev foo &&
12 test_commit foo-dev foo &&
13 git config rerere.enabled true
16 test_expect_success
'conflicting merge' '
17 test_must_fail git merge master
20 test_expect_success
'fixup' '
21 echo foo-resolved >foo &&
22 git commit -am resolved &&
24 git reset --hard HEAD^
27 test_expect_success
'cherry-pick conflict' '
28 test_must_fail git cherry-pick master &&
32 test_expect_success
'reconfigure' '
33 git config rerere.enabled false &&
37 test_expect_success
'cherry-pick conflict without rerere' '
38 test_must_fail git cherry-pick master &&
39 test_must_fail test_cmp expect foo