diff tests/test-stabilize-conflict.t @ 5996:91c3a9dd5f77 mercurial-5.7

test-compat: merge stable into mercurial-5.7
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 12 Aug 2021 22:00:46 +0200
parents a1dad44fe3da
children fd039a7f0c3c b1d1f4ade142
line wrap: on
line diff