[openssl/tools] 25be94: ghmerge and pick-to-branch: improve hints on how t...

[David von Oheimb]

  Branch: refs/heads/master
  Home:   https://github.com/openssl/tools
  Commit: 25be94057c7af13bcb97cf481b97bc5b55f65c8f
      https://github.com/openssl/tools/commit/25be94057c7af13bcb97cf481b97bc5b55f65c8f
  Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
  Date:   2022-09-29 (Thu, 29 Sep 2022)

  Changed paths:
    M review-tools/ghmerge
    M review-tools/pick-to-branch

  Log Message:
  -----------
  ghmerge and pick-to-branch: improve hints on how to handle conflicts

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