diff tests/test-stabilize-conflict.t @ 4547:bdcea921d28b mercurial-4.9

test-compat: merge stable into mercurial-4.9
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 20 Apr 2019 03:55:04 +0200
parents fb8e44c70798
children 684cc3418ecd a2fdbece7ce1 96ce1030d2fb
line wrap: on
line diff