diff tests/test-stabilize-conflict.t @ 2990:c2102598adf5

topic: merge with strip related fix
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 26 Sep 2017 12:58:10 +0200
parents 06844693bb21
children bd7e8be29542
line wrap: on
line diff