equal
deleted
inserted
replaced
11 created new head |
11 created new head |
12 |
12 |
13 $ hg merge 1 |
13 $ hg merge 1 |
14 merging a |
14 merging a |
15 warning: conflicts during merge. |
15 warning: conflicts during merge. |
16 merging a failed! |
16 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
17 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
17 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
18 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
18 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
19 [1] |
19 [1] |
20 |
20 |
21 $ hg id |
21 $ hg id |