view tests/test-ui-color.py.out @ 47916:65e3d8028f2e

dirstate: drop the `_merge` method It only has one caller that only use one of the branch, so lets inline that branch and clean things up further. Differential Revision: https://phab.mercurial-scm.org/D11351
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 Aug 2021 21:16:48 +0200
parents b8c2004a8d2b
children
line wrap: on
line source

warning
error
b'buffered\n'
colored? True
colored? True