Mercurial > evolve
diff tests/test-exchange-obsmarkers-case-C3.t @ 2531:d3d686f05458 mercurial-4.1
test-compat: merge with stable
Nothing special to report, minor test-metaedit.t output change.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 31 May 2017 14:21:18 +0200 |
parents | 5adb8bdb935e |
children | 51a1dd295fe0 |
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-C3.t Mon May 22 15:28:36 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-C3.t Wed May 31 14:21:18 2017 +0200 @@ -84,8 +84,8 @@ =========== a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 40be80b35671116f2c61ef25797806536a6eb5a0 28b51eb45704506b5c603decd6bf7ac5e0f6a52f beac7228bbe708bc7c9181c3c27f8a17f21dbd9f - 06055a7959d4128e6e3bccfd01482e83a2db8a3a 8b648bd67281e9e525919285ac7b3bb2836c2f02 - e5ea8f9c73143125d36658e90ef70c6d2027a5b7 dcd2b566ad0983333be704afdc205066e1a6b742 + 06055a7959d4128e6e3bccfd01482e83a2db8a3a 04b20150f38991d297ecfe0bf0f77deb816aed9d + e5ea8f9c73143125d36658e90ef70c6d2027a5b7 a59f7d5ea437389a33d2e98b9b85ba1d568a743e obshashrange ============ rev node index size depth obshash