diff tests/test-topic-merge.t @ 5964:7204178ac04a

tests: spell out hg resolve See previous commits for the rationale.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 17 Jun 2021 11:18:30 +0300
parents 3946ee4ee3ae
children 55fbf9c8bfe0
line wrap: on
line diff