equal
deleted
inserted
replaced
1 created new head |
|
2 merging foo1 and foo to foo1 |
|
3 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
4 (branch merge, don't forget to commit) |
|
5 n 0 -2 bar |
|
6 m 644 14 foo1 |
|
7 copy: foo -> foo1 |
|
8 M bar |
|
9 M foo1 |
|
10 % removing foo1 and bar |
|
11 r 0 -2 bar |
|
12 r 0 -1 foo1 |
|
13 copy: foo -> foo1 |
|
14 R bar |
|
15 R foo1 |
|
16 % readding foo1 and bar |
|
17 adding bar |
|
18 adding foo1 |
|
19 n 0 -2 bar |
|
20 m 644 14 foo1 |
|
21 copy: foo -> foo1 |
|
22 M bar |
|
23 M foo1 |
|
24 foo |
|
25 % reverting foo1 and bar |
|
26 saving current version of bar as bar.orig |
|
27 reverting bar |
|
28 saving current version of foo1 as foo1.orig |
|
29 reverting foo1 |
|
30 n 0 -2 bar |
|
31 m 644 14 foo1 |
|
32 copy: foo -> foo1 |
|
33 M bar |
|
34 M foo1 |
|
35 foo |
|