Mercurial > hg
comparison tests/test-conflict.out @ 6518:92ccccb55ba3
resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 11 Apr 2008 12:52:56 -0500 |
| parents | 4b0c9c674707 |
| children | 9fe7e6acf525 |
comparison
equal
deleted
inserted
replaced
| 6517:fcfb6a0a0a84 | 6518:92ccccb55ba3 |
|---|---|
| 2 created new head | 2 created new head |
| 3 merging a | 3 merging a |
| 4 warning: conflicts during merge. | 4 warning: conflicts during merge. |
| 5 merging a failed! | 5 merging a failed! |
| 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 7 There are unresolved merges, you can redo the full merge using: | 7 use 'hg resolve' to retry unresolved file merges |
| 8 hg update -C 2 | |
| 9 hg merge 1 | |
| 10 e7fe8eb3e180+0d24b7662d3e+ tip | 8 e7fe8eb3e180+0d24b7662d3e+ tip |
| 11 <<<<<<< local | 9 <<<<<<< local |
| 12 something else | 10 something else |
| 13 ======= | 11 ======= |
| 14 something | 12 something |