pick-to-branch: Allow fixing trivial conflicts when cherry-picking

Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/110)

diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index dd361297722e0222957846fdd89c47087477a798..1661e9373d512fb6a9f38e08df99ad7cb3fa54d4 100755 (executable)
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -112,7 +112,7 @@ git checkout $target
 ORIG_TARGET_HEAD=`git show -s --format="%H"`
 git pull --ff-only `git rev-parse --abbrev-ref  @{u} | sed "s|/| |"`
 CHERRYPICKING=1
-git cherry-pick -e -x $id~$num..$id || (git cherry-pick --abort; exit 1)
+git cherry-pick -e -x $id~$num..$id || (echo 'Fix or Ctrl-d to abort' ; read || exit 1)
 CHERRYPICKING=
 
 while true ; do