Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-conflict.out Fri Apr 11 12:04:26 2008 +0200 +++ b/tests/test-conflict.out Fri Apr 11 12:52:56 2008 -0500 @@ -4,9 +4,7 @@ warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -There are unresolved merges, you can redo the full merge using: - hg update -C 2 - hg merge 1 +use 'hg resolve' to retry unresolved file merges e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else