Mercurial > hg
comparison tests/test-keyword.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 | fb32ae9c76e7 |
| children | b83a11536fc6 |
comparison
equal
deleted
inserted
replaced
| 7820:346fafc144fc | 7821:9fe7e6acf525 |
|---|---|
| 456 created new head | 456 created new head |
| 457 merging m | 457 merging m |
| 458 warning: conflicts during merge. | 458 warning: conflicts during merge. |
| 459 merging m failed! | 459 merging m failed! |
| 460 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 460 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 461 use 'hg resolve' to retry unresolved file merges | 461 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
| 462 % keyword stays outside conflict zone | 462 % keyword stays outside conflict zone |
| 463 $Id$ | 463 $Id$ |
| 464 <<<<<<< local | 464 <<<<<<< local |
| 465 bar | 465 bar |
| 466 ======= | 466 ======= |