comparison contrib/simplemerge @ 48329:8b927b33310a

branching: merge stable into default
author Raphaël Gomès <rgomes@octobus.net>
date Fri, 19 Nov 2021 11:20:10 +0100
parents c102b704edb5
children c91418480cb0
comparison
equal deleted inserted replaced
48323:5d83a40cd3f8 48329:8b927b33310a