Mercurial > hg-stable

diff CONTRIBUTORS @ 44478:c8fd21413458

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies-tests: add a case where with merge with an overwritten files This is similar to the BF/FB case, but in this case, the other branch updated the file. So an actual merge happens and the two "independant" file history has to be merged. Differential Revision: https://phab.mercurial-scm.org/D8242
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 03 Mar 2020 15:56:00 +0100
parents c29efd272395
children
line wrap: on
line diff