diff tests/test-stabilize-conflict.t @ 6002:cb93b13305c6 mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 12 Aug 2021 22:01:02 +0200
parents 664f62e57231
children 270223576b7f
line wrap: on
line diff