Mercurial > hg

diff mercurial/bundlerepo.py @ 44459:6f1f4a6f4168

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies-tests: add a case where a file is deleted/added but with a merge This is a case similar to DB/BD, 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/D8241
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 03 Mar 2020 15:46:28 +0100
parents 698e11f7be6a
children 88d5abec8f61
line wrap: on
line diff