Mercurial > hg
comparison tests/test-conflict.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Wed, 04 Mar 2009 13:06:16 -0600 |
| parents | 92ccccb55ba3 |
| children | b2310903c462 |
comparison
equal
deleted
inserted
replaced
| 7820:346fafc144fc | 7821:9fe7e6acf525 |
|---|---|
| 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 use 'hg resolve' to retry unresolved file merges | 7 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
| 8 e7fe8eb3e180+0d24b7662d3e+ tip | 8 e7fe8eb3e180+0d24b7662d3e+ tip |
| 9 <<<<<<< local | 9 <<<<<<< local |
| 10 something else | 10 something else |
| 11 ======= | 11 ======= |
| 12 something | 12 something |