comparison tests/test-stabilize-conflict.t @ 4173:e268f7fd7839 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 15:15:09 +0200
parents fb8e44c70798
children 684cc3418ecd a2fdbece7ce1 96ce1030d2fb
comparison
equal deleted inserted replaced
4172:35c21ab64420 4173:e268f7fd7839