diff tests/test-stabilize-conflict.t @ 4535:8dae14cd076a stable

topic: only wrap mergeupdate for repo with topic This helps repository with and without topic to coexist in the same process.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 18 Apr 2019 11:13:49 +0200
parents fb8e44c70798
children 684cc3418ecd a2fdbece7ce1 96ce1030d2fb
line wrap: on
line diff