Merge branch 'pw/p4-submit-conflicts'

diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index afda2d5825f6c087e22a7830d2b1aebb50923c3a..340afc760de030879fff496dca3db8432a6b992b 100755 (executable)
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -44,7 +44,7 @@ test_expect_success 'cherry-pick first..fourth works' '
        check_head_differs_from fourth
 '
 
-test_expect_failure 'cherry-pick three one two works' '
+test_expect_success 'cherry-pick three one two works' '
        git checkout -f first &&
        test_commit one &&
        test_commit two &&