index 851b147f8151d6b63819057b5aa62c1565a768a3..e80050e1fef9c7c2d83a34aaa671415ea168e8c4 100755 (executable)
test_i18ngrep "The previous cherry-pick is now empty" msg
'
-test_expect_failure 'follow advice and skip nil patch' '
+test_expect_success 'follow advice and skip nil patch' '
pristine_detach conflicting &&
test_must_fail git cherry-pick initial..picked &&