comparison tests/test-stabilize-conflict.t @ 3120:add76a5eb1ae mercurial-3.9

test-compat: merge future 6.7.0 in mercurial-3.9 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 22:56:21 +0200
parents 088ea9b74e47
children
comparison
equal deleted inserted replaced
3112:706402d70b3f 3120:add76a5eb1ae