diff tests/test-merge6.t @ 28102:bd74b5e0d2c0

destutil: extract all 'mergedest' abort messages into a dictionary We plan to be able to reuse this function for rebase. The error message explicitly refers to "merge" in multiple places. So we'll need to be able to use different messages. The first step of that is to extract all messages in a dedicated dictionary and use them indirectly. As a side effect it clarifies the actual function and opens the way to various cleanups and fixes in future changesets.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 09 Feb 2016 21:14:37 +0000
parents f2719b387380
children 2428e8ec0793
line wrap: on
line diff