[openssl/tools] 5c7aaa: ghmerge: support handling conflicts on --cherry-pick

[David von Oheimb]

  Branch: refs/heads/master
  Home:   https://github.com/openssl/tools
  Commit: 5c7aaae1ab46466d01d3c7b81b4c53e3cc56d45f
      https://github.com/openssl/tools/commit/5c7aaae1ab46466d01d3c7b81b4c53e3cc56d45f
  Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
  Date:   2022-10-21 (Fri, 21 Oct 2022)

  Changed paths:
    M review-tools/ghmerge

  Log Message:
  -----------
  ghmerge: support handling conflicts on --cherry-pick

Reviewed-by: Paul Dale <pauli at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/tools/pull/129)