pick-to-branch: Allow fixing trivial conflicts when cherry-picking
authorTomas Mraz <tomas@openssl.org>
Mon, 14 Mar 2022 14:22:39 +0000 (15:22 +0100)
committerTomas Mraz <tomas@openssl.org>
Mon, 14 Mar 2022 14:22:39 +0000 (15:22 +0100)
commit96e584bd1cff6da9aa33f3e2f104bd5851bf4b29
tree091f898b871ece032c6cd9fa4fc0e13b54cb9159
parent3456e407ac23d1161e6e8c7efeada9e382e60d6f
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)
review-tools/pick-to-branch