equal
deleted
inserted
replaced
11 A a |
11 A a |
12 A b |
12 A b |
13 % should fail |
13 % should fail |
14 a already tracked! |
14 a already tracked! |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 created new head |
16 merging a |
17 merging a |
17 warning: conflicts during merge. |
18 warning: conflicts during merge. |
18 merging a failed! |
19 merging a failed! |
19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
20 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
20 There are unresolved merges, you can redo the full merge using: |
21 There are unresolved merges, you can redo the full merge using: |