Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-config-env.py.out
author Mark Thomas <mbthomas@fb.com>
Mon, 02 Oct 2017 14:05:30 -0700
changeset 34546 e4cf957bf7ce
parent 31690 d83e51654c8a
permissions -rw-r--r--
commands: update the resolve command to handle path conflicts The resolve command must support displaying path conflicts and marking them as resolved or unresolved. Differential Revision: https://phab.mercurial-scm.org/D775
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
31690
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset 
     1
 
pager.pager=p0 # $TESTTMP/sysrc:4
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset 
     2
 
ui.editor=e1 # $TESTTMP/userrc:2
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset 
     3
 












d83e51654c8a
rcutil: let environ override system configs (BC)



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     4


pager.pager=p2 # $PAGER













d83e51654c8a
rcutil: let environ override system configs (BC)



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     5


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













d83e51654c8a
rcutil: let environ override system configs (BC)



Jun Wu <quark@fb.com>


parents: 

diff
changeset




     6
















hg-stable