diff tests/test-stabilize-conflict.t @ 4511:e4fc3af2d0a9 mercurial-4.8

test-compat: merge stable into mercurial-4.8
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2019 22:41:25 +0200
parents fb8e44c70798
children 684cc3418ecd a2fdbece7ce1 96ce1030d2fb
line wrap: on
line diff