diff mercurial/simplemerge.py @ 50751:0a55206c5a1e

branching: merge stable into default
author Raphaël Gomès <rgomes@octobus.net>
date Thu, 06 Jul 2023 16:07:34 +0200
parents 2282d8ac0fa9
children f4733654f144
line wrap: on
line diff