ghmerge: support handling conflicts on interactive rebase
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>
Thu, 24 Nov 2022 21:28:28 +0000 (22:28 +0100)
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>
Thu, 24 Nov 2022 21:28:28 +0000 (22:28 +0100)
commit960c12cf20ac8039ab3f830859f422e40c7936a8
tree17a8beaf4cd599edd6a0c1ed4b18a12c659c13c3
parent9cb7b2461030c1542ac2a6a1f039020427a1c250
ghmerge: support handling conflicts on interactive rebase

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