equal
deleted
inserted
replaced
14 merging a |
14 merging a |
15 warning: conflicts during merge. |
15 warning: conflicts during merge. |
16 merging a failed! |
16 merging a failed! |
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 |
20 |
20 $ hg id |
21 $ hg id |
21 32e80765d7fe+75234512624c+ tip |
22 32e80765d7fe+75234512624c+ tip |
22 |
23 |
23 $ cat a |
24 $ cat a |