diff tests/test-stabilize-conflict.t @ 5604:f27ef537bf83

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 20 Oct 2020 10:33:46 +0200
parents b2de5825e5ca
children afcd4e44816f e5d91fd1f319
line wrap: on
line diff