Mercurial > hg
view tests/test-config-env.py.out @ 39196:8c6775e812d8 stable
merge: do not delete untracked files silently (issue5962)
37450a122128, 2a774cae3a03, and 656ac240f392 weren't enough to prevent data
loss. No unknown "files" weren't deleted before 7a8a16f8ea22, "context: also
consider path conflicts when clearing unknown files."
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 19 Aug 2018 13:27:02 +0900 |
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