Mercurial > hg
comparison tests/test-rebase-abort.t @ 23477:689540e6007e stable
update: add tests for untracked local file
We don't seem to have any tests for updating to another revision when
there are untracked files on the local side that conflict with the
those on the remote side, so let's add tests. This shows how we
overwrite untracked ignored files when updating to a revision that
tracks the file.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 02 Dec 2014 17:11:01 -0800 |
| parents | 46c2331fc750 |
| children | 328afbad6e57 |
comparison
equal
deleted
inserted
replaced
| 23440:57d35d3c1cf1 | 23477:689540e6007e |
|---|