equal
deleted
inserted
replaced
21 % unresolve |
21 % unresolve |
22 % merge foo |
22 % merge foo |
23 merging foo and foo2 |
23 merging foo and foo2 |
24 all conflicts resolved |
24 all conflicts resolved |
25 % save |
25 % save |
|
26 % merge auto |
|
27 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 (branch merge, don't forget to commit) |
|
30 merging foo2 and foo |
|
31 warning: conflicts during merge. |
|
32 merging foo2 failed! |
|
33 U foo2 |
|
34 foo |
|
35 <<<<<<< local |
|
36 foo |
|
37 ======= |
|
38 bar |
|
39 >>>>>>> other |
26 % load |
40 % load |
27 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
42 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
30 (branch merge, don't forget to commit) |
44 (branch merge, don't forget to commit) |