equal
deleted
inserted
replaced
5 created new head |
5 created new head |
6 merging bar |
6 merging bar |
7 merging bar failed! |
7 merging bar failed! |
8 merging foo and baz to baz |
8 merging foo and baz to baz |
9 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
9 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
10 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
10 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
11 U bar |
11 U bar |
12 R baz |
12 R baz |
13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
14 merging bar |
14 merging bar |
15 merging bar failed! |
15 merging bar failed! |
16 merging baz and foo to baz |
16 merging baz and foo to baz |
17 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
17 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
18 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
18 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
19 % show unresolved |
19 % show unresolved |
20 U bar |
20 U bar |
21 R baz |
21 R baz |
22 % unmark baz |
22 % unmark baz |
23 % show |
23 % show |