comparison tests/test-stabilize-conflict.t @ 3382:f14ad1e83896 mercurial-4.1

test-compat: merge mercurial-4.2 into mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 16 Dec 2017 23:40:42 +0100
parents 3e2abd40da07
children 088ea9b74e47 1e2f683e11e7
comparison
equal deleted inserted replaced
3289:bd99cb54712b 3382:f14ad1e83896