Mercurial > hg

view tests/test-config-env.py.out @ 45347:1aef38d973e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: pass mergeresult obj in _forgetremoved() (API) Instead of returning a dict of actions and then updating it, let's pass the object directly and update it there. This makes `updateactions()` on mergeresult unused and this patch removes that. After this patch, we have couple of methods left on mergeresult class which still exposes the internal dict based action storage. Differential Revision: https://phab.mercurial-scm.org/D8889
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 05 Aug 2020 16:52:51 +0530
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