ghmerge: support handling conflicts on --cherry-pick

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/129)

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index edcb80a26ff36010aead55526265ecc6188bb0d4..67e5f6e7b2e93ada90c29a9892ba6585c901df57 100755 (executable)
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -219,7 +219,7 @@ else
     git checkout -b $WORK $TARGET
     WORK_USED=$WORK
     CHERRYPICKING=1
-    git fetch $REPO $BRANCH && (git cherry-pick FETCH_HEAD~$PICK..FETCH_HEAD || exit 1)
+    git fetch $REPO $BRANCH && (git cherry-pick FETCH_HEAD~$PICK..FETCH_HEAD || (echo -ne "Press Ctrl-d to abort, or fix the issue in another shell,\n    run 'git cherry-pick --continue' there, and on success press Enter here: "; read || exit 1))
     CHERRYPICKING=
 fi