##// END OF EJS Templates
merge: do not delete untracked files silently (issue5962)...
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."

File last commit:

r38029:e51c91c1 default
r39232:8c6775e8 stable
Show More
default-tools.rc
5 lines | 62 B | text/x-stsrc | TextLexer
[ui]
editor = sensible-editor
[pager]
pager = sensible-pager