Mercurial > hg
comparison tests/test-merge-local.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 | 5af5f0f9d724 |
children | a964ab624385 |
comparison
equal
deleted
inserted
replaced
6517:fcfb6a0a0a84 | 6518:92ccccb55ba3 |
---|---|
19 # local merge with bad merge tool | 19 # local merge with bad merge tool |
20 merging zzz1_merge_ok | 20 merging zzz1_merge_ok |
21 merging zzz2_merge_bad | 21 merging zzz2_merge_bad |
22 merging zzz2_merge_bad failed! | 22 merging zzz2_merge_bad failed! |
23 3 files updated, 1 files merged, 2 files removed, 1 files unresolved | 23 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
24 There are unresolved merges with locally modified files. | 24 use 'hg resolve' to retry unresolved file merges |
25 You can finish the partial merge using: | |
26 hg update 0 | |
27 hg update 1 | |
28 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | 25 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
29 --- a/zzz1_merge_ok | 26 --- a/zzz1_merge_ok |
30 +++ b/zzz1_merge_ok | 27 +++ b/zzz1_merge_ok |
31 +new first line | 28 +new first line |
32 +new last line | 29 +new last line |
40 merging zzz1_merge_ok | 37 merging zzz1_merge_ok |
41 merging zzz2_merge_bad | 38 merging zzz2_merge_bad |
42 warning: conflicts during merge. | 39 warning: conflicts during merge. |
43 merging zzz2_merge_bad failed! | 40 merging zzz2_merge_bad failed! |
44 3 files updated, 1 files merged, 2 files removed, 1 files unresolved | 41 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
45 There are unresolved merges with locally modified files. | 42 use 'hg resolve' to retry unresolved file merges |
46 You can finish the partial merge using: | |
47 hg update 0 | |
48 hg update 1 | |
49 2 files updated, 0 files merged, 3 files removed, 0 files unresolved | 43 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
50 --- a/zzz1_merge_ok | 44 --- a/zzz1_merge_ok |
51 +++ b/zzz1_merge_ok | 45 +++ b/zzz1_merge_ok |
52 +new first line | 46 +new first line |
53 +new last line | 47 +new last line |