Mercurial > hg

diff mercurial/hg.py @ 46580:2076df13d00f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies-rust: refactor the "deletion" case We rearrange the code to single out the case where information need to be overwritten on both side of the merge. This open the way to better dealing with this case. Differential Revision: https://phab.mercurial-scm.org/D9651
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 16 Dec 2020 10:59:00 +0100
parents 95a615dd77bf
children a4c19a162615 1099541b6462
line wrap: on
line diff