Mercurial > hg

diff mercurial/merge.py @ 49963:23b70ce09e55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: rename `@requires_parents_change` to `@requires_changing_parents` This match the rename of the context manager.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 26 Jan 2023 15:17:29 +0100
parents 7a8bfc05b691
children e60f9168263c
line wrap: on
line diff