diff tests/test-stabilize-conflict.t @ 4301:5cbaf5d25443

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 13 Dec 2018 18:57:49 +0100
parents fb8e44c70798
children 684cc3418ecd a2fdbece7ce1 96ce1030d2fb
line wrap: on
line diff