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 Pierre-Yves David <pierre-yves.david@octobus.net>
Sat, 13 Mar 2021 04:54:05 +0100
changeset 46812 e4696ba43ecd
parent 31690 d83e51654c8a
permissions -rw-r--r--
test-copies: show some wrong ChangedFiles upgrade For file present only on one side and touched during merge, the upgrade code confused them as "merged". However they should be either "touched", or "salvaged" but they are currently recorded as "merged". See the next changesets for more details on these cases and fix. Differential Revision: https://phab.mercurial-scm.org/D10218
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