| changeset 19802 | 94c394653b2a |
| parent 15619 | 6c8573dd1b6b |
| child 23449 | eeecf29cc397 |
| 19801:41abe2e3e3b7 | 19802:94c394653b2a |
|---|---|
17 Local deleted a file, remote removed |
17 Local deleted a file, remote removed |
18 |
18 |
19 Should fail, since there are deleted files: |
19 Should fail, since there are deleted files: |
20 |
20 |
21 $ hg merge |
21 $ hg merge |
22 abort: outstanding uncommitted changes |
22 abort: uncommitted changes |
23 (use 'hg status' to list changes) |
23 (use 'hg status' to list changes) |
24 [255] |
24 [255] |
25 |
25 |
26 Should succeed with --force: |
26 Should succeed with --force: |
27 |
27 |