diff tests/test-simplemerge.py @ 49972:1bd33932713d

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 31 Jan 2023 11:41:59 +0100
parents 6000f5b25c9b
children 493034cc3265
line wrap: on
line diff