equal
deleted
inserted
replaced
7 reverting file1 |
7 reverting file1 |
8 9eca13a34789 |
8 9eca13a34789 |
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10 f248da0d4c3e tip |
10 f248da0d4c3e tip |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12 merge: warning: conflicts during merge |
12 warning: conflicts during merge. |
13 merging file1 |
13 merging file1 |
14 merging file1 failed! |
14 merging file1 failed! |
15 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
15 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
16 There are unresolved merges with locally modified files. |
16 There are unresolved merges with locally modified files. |
17 You can redo the full merge using: |
17 You can redo the full merge using: |