HomePhabricator

merge: do not delete untracked files silently (issue5962)

Authored by yuja.

Description

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."

Details

Committed
yujaAug 19 2018, 12:27 AM
Parents
rHGcee9043c7dba: perf: fix typo in perfphasesremote()
Branches
Unknown
Tags
Unknown