ghmerge: Fix behavior on failed cherry-pick, rebase, and pull
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>
Mon, 25 Oct 2021 12:45:17 +0000 (14:45 +0200)
committerTomas Mraz <tomas@openssl.org>
Mon, 22 Nov 2021 13:52:01 +0000 (14:52 +0100)
commit9ce7e5fb4ed7546ba412d14422e4bf2713bc1440
tree7e67a508f1fbc38c59fa4dcd73d45a1435fe396b
parentb57692c1f0b653ba5e4cbb2ae581b6f9def2bb45
ghmerge: Fix behavior on failed cherry-pick, rebase, and pull

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