diff tests/test-diff-newlines.t @ 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 aaa1f8f514cf
children 5abc47d4ca6b
line wrap: on
line diff