Re: [PATCH 17/18] revert: Introduce --continue to continue the operation
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:46
Ramkumar Ramachandra [off-list ref] writes:
Junio: Here's another small fixup patch for your convenience.
Not very convenient I am afraid ;-)
--8<--
This seems to be too short for "am -c"; have you tried applying it yourself first before sending it out?
quoted hunk ↗ jump to hunk
Subject: [PATCH] fixup! revert: Introduce --continue to continue the operation Signed-off-by: Ramkumar Ramachandra <redacted> --- t/t3510-cherry-pick-sequence.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 78f3f01..3bca2b3 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh@@ -171,7 +171,7 @@ test_expect_success '--continue respects opts' ' grep "cherry picked from" anotherpick_msg ' -test_expect_success '--signoff is not automatically propogated toresolved conflict' ' +test_expect_success '--signoff is not automatically propagated to resolved conflict' '
Linewrapped. I'll squash this manually, so no need to resend. Thanks.