Branch: refs/heads/master
Home: https://github.com/openssl/tools
Commit: 960c12cf20ac8039ab3f830859f422e40c7936a8
https://github.com/openssl/tools/commit/960c12cf20ac8039ab3f830859f422e40c7936a8
Author: Dr. David von Oheimb <david.von.ohe...@siemens.com>
Date: 2022-11-24 (Thu, 24 Nov 2022)
Changed paths:
M review-tools/ghmerge
Log Message:
-----------
ghmerge: support handling conflicts on interactive rebase
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Hugo Landau <hlan...@openssl.org>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/tools/pull/132)
