comparison mercurial/merge.py @ 46555:46205a478a08

test-copies: add 3 new files with their own content The new `p`, `q` and `r` file mirror the `a`, `b` and `h` but with different content for each files. This will be used to create "mirror" test case that involve actual merge happening. For now, we only add the file to keep patches small and easier to review. Differential Revision: https://phab.mercurial-scm.org/D10053
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 19 Feb 2021 17:06:12 +0100
parents dc00324e80f4
children e2f7b2695ba1
comparison
equal deleted inserted replaced
46554:664bee002d1a 46555:46205a478a08