Mercurial > hg

view tests/test-config-env.py.out @ 47916:65e3d8028f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d83e51654c8a
children
line wrap: on
line source

pager.pager=p0 # $TESTTMP/sysrc:4
ui.editor=e1 # $TESTTMP/userrc:2

pager.pager=p2 # $PAGER
ui.editor=e1 # $TESTTMP/userrc:2