Mercurial > hg-stable

diff tests/test-merge2.t @ 47949:496a8e383aeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: drop the `_otherparent` method It only has one caller with a lot of the logic already implemented. So lets inline it and cleans things up further. Differential Revision: https://phab.mercurial-scm.org/D11353
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 Aug 2021 21:25:35 +0200
parents 8d72e29ad1e0
children
line wrap: on
line diff