equal
deleted
inserted
replaced
13 % status -v |
13 % status -v |
14 merging e6da46716401 and 30d266f502e7 |
14 merging e6da46716401 and 30d266f502e7 |
15 U foo (foo2) |
15 U foo (foo2) |
16 % next |
16 % next |
17 foo |
17 foo |
|
18 % resolve and unresolve |
|
19 merging e6da46716401 and 30d266f502e7 |
|
20 R foo (foo2) |
|
21 all conflicts resolved |
|
22 merging e6da46716401 and 30d266f502e7 |
|
23 U foo (foo2) |
18 % merge next |
24 % merge next |
19 merging foo and foo2 |
25 merging foo and foo2 |
20 all conflicts resolved |
26 all conflicts resolved |
21 % unresolve |
27 % unresolve |
22 % merge foo |
28 % merge foo |