Mercurial > hg
comparison tests/test-journal-share.t @ 34552:33c8a6837181
merge: check for path conflicts when updating (issue5628)
When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.
Differential Revision: https://phab.mercurial-scm.org/D781
| author | Mark Thomas <mbthomas@fb.com> |
|---|---|
| date | Mon, 02 Oct 2017 14:05:30 -0700 |
| parents | 9843e3d9f4b6 |
| children | a8a902d7176e |
comparison
equal
deleted
inserted
replaced
| 34551:1609a5afc4f5 | 34552:33c8a6837181 |
|---|