projects / tools.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bfdac07) | patch
ghmerge: support handling conflicts on --cherry-pick
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>
Wed, 19 Oct 2022 18:34:04 +0000 (20:34 +0200)
committerTomas Mraz <tomas@openssl.org>
Fri, 21 Oct 2022 17:02:39 +0000 (19:02 +0200)
commit5c7aaae1ab46466d01d3c7b81b4c53e3cc56d45f
tree8e8934b8dfec1f0dc28527fcba322f1b8622e93etree | snapshot
parentbfdac072d9b21a4c16fd3fb437a1663225cb8833commit | diff
ghmerge: support handling conflicts on --cherry-pick

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/129)
review-tools/ghmerge diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.