diff tests/test-stabilize-conflict.t @ 4074:eb4d07a0b19f mercurial-4.6

test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 21:59:24 +0200
parents fb8e44c70798
children 684cc3418ecd a2fdbece7ce1 96ce1030d2fb
line wrap: on
line diff