Mercurial > hg

comparison tests/test-merge4.t @ 39196:8c6775e812d8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 63c817ea4a70
children 8561ad49915d
comparison
equal deleted inserted replaced
39193:cee9043c7dba 39196:8c6775e812d8