diff tests/test-stabilize-conflict.t @ 4162:ba1e83c841f2 stable

test: backed out output changes from changeset 01ad46551d7c
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 14:55:20 +0200
parents fb8e44c70798
children 684cc3418ecd a2fdbece7ce1 96ce1030d2fb
line wrap: on
line diff