projects / tools.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8512637) | patch
ghmerge and pick-to-branch: improve hints on how to handle conflicts
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>
Sat, 24 Sep 2022 15:34:55 +0000 (17:34 +0200)
committerPauli <pauli@openssl.org>
Wed, 28 Sep 2022 23:38:39 +0000 (09:38 +1000)
commit25be94057c7af13bcb97cf481b97bc5b55f65c8f
treef2cf7bf5c85f0b693feca27e9441fad925be6566tree | snapshot
parent85126371f5705e6b3749eff73238b592c2ab91b3commit | diff
ghmerge and pick-to-branch: improve hints on how to handle conflicts

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