diff tests/test-bad-pull.t @ 46813:316a768f2e43

test-copies: add a test updating file content while salvaging it A deleted file is brought back during a merge. Its content is changed in the same go. This reveal some issue with the upgrade code. Differential Revision: https://phab.mercurial-scm.org/D10088
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 02 Mar 2021 02:00:29 +0100
parents ebee234d952a
children
line wrap: on
line diff