diff tests/test-stabilize-conflict.t @ 4995:d31d39ea0fe4 stable

test: add test for content divergence involving a date update In this case, one side update to an older date.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 10 Dec 2019 19:27:55 +0100
parents b6c819facbe8
children b2de5825e5ca
line wrap: on
line diff