diff tests/test-stabilize-conflict.t @ 3929:e709e3817d7e mercurial-4.5

test-compat: merge mercurial-4.6 into mercurial-4.5
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 02:42:15 +0200
parents 629558d09898
children d00f0c369bc7 fb8e44c70798
line wrap: on
line diff