comparison mercurial/mergeutil.py @ 50269:05de4896508e stable 6.4rc0

branching: merge default into stable
author Raphaël Gomès <rgomes@octobus.net>
date Thu, 02 Mar 2023 22:45:44 +0100
parents 6000f5b25c9b
children f4733654f144
comparison
equal deleted inserted replaced
50251:1ded5b48b8aa 50269:05de4896508e