Mercurial > hg
comparison tests/test-merge-prompt.out @ 5764:8a5d8fb59ed2
Backed out changeset c2a21fe60994
Unfortunately, this breaks backward compatibility.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 31 Dec 2007 17:47:02 -0600 |
| parents | c2a21fe60994 |
| children | 4b0c9c674707 |
comparison
equal
deleted
inserted
replaced
| 5762:c2a21fe60994 | 5764:8a5d8fb59ed2 |
|---|---|
| 5 # non-interactive merge | 5 # non-interactive merge |
| 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 7 (branch merge, don't forget to commit) | 7 (branch merge, don't forget to commit) |
| 8 status: | 8 status: |
| 9 M file2 | 9 M file2 |
| 10 = file1 | 10 C file1 |
| 11 file1: | 11 file1: |
| 12 1 | 12 1 |
| 13 changed | 13 changed |
| 14 file2: | 14 file2: |
| 15 2 | 15 2 |
| 21 use (c)hanged version or (d)elete? remote changed file2 which local deleted | 21 use (c)hanged version or (d)elete? remote changed file2 which local deleted |
| 22 use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 22 use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 23 (branch merge, don't forget to commit) | 23 (branch merge, don't forget to commit) |
| 24 status: | 24 status: |
| 25 file2: No such file or directory | 25 file2: No such file or directory |
| 26 = file1 | 26 C file1 |
| 27 file1: | 27 file1: |
| 28 1 | 28 1 |
| 29 changed | 29 changed |
| 30 file2 does not exist | 30 file2 does not exist |
| 31 | 31 |
| 55 use (c)hanged version or (d)elete? remote changed file2 which local deleted | 55 use (c)hanged version or (d)elete? remote changed file2 which local deleted |
| 56 use (c)hanged version or leave (d)eleted? abort: response expected | 56 use (c)hanged version or leave (d)eleted? abort: response expected |
| 57 failed | 57 failed |
| 58 status: | 58 status: |
| 59 file2: No such file or directory | 59 file2: No such file or directory |
| 60 = file1 | 60 C file1 |
| 61 file1: | 61 file1: |
| 62 1 | 62 1 |
| 63 changed | 63 changed |
| 64 file2 does not exist | 64 file2 does not exist |