Mercurial > hg
view tests/test-config-env.py.out @ 48516:59524cb1cd73
simplemerge: don't calculate conflict labels when resolving automatically
Differential Revision: https://phab.mercurial-scm.org/D11903
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 07 Dec 2021 23:01:20 -0800 |
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