index e0bf3563ac1a864129e0739d84f11c9eac9f0882..95741801b0007b6ecbf22f665c4dcf3c744d5221 100755 (executable)
error: could not apply \$picked... picked
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
- hint: and commit the result with 'git commit -c CHERRY_PICK_HEAD'
+ hint: and commit the result with 'git commit'
EOF
test_must_fail git cherry-pick picked 2>actual &&