equal
deleted
inserted
replaced
1 1:016807e6fdaf |
1 1:016807e6fdaf |
2 0:eb43f19ff115 |
2 0:eb43f19ff115 |
3 016807e6fdaf tip |
3 016807e6fdaf tip |
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 eb43f19ff115 |
5 eb43f19ff115 |
5 eb43f19ff115+ |
6 eb43f19ff115+ |
6 reverting file1 |
7 reverting file1 |
7 ? file1.orig |
8 ? file1.orig |
8 eb43f19ff115 |
9 eb43f19ff115 |
|
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9 ? file1.orig |
11 ? file1.orig |
10 016807e6fdaf tip |
12 016807e6fdaf tip |
|
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 merging file1 |
14 merging file1 |
|
15 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
12 ? file1.orig |
16 ? file1.orig |
13 016807e6fdaf tip |
17 016807e6fdaf tip |
14 ? file1.orig |
18 ? file1.orig |
15 016807e6fdaf tip |
19 016807e6fdaf tip |
16 ? file1.orig |
20 ? file1.orig |
17 016807e6fdaf tip |
21 016807e6fdaf tip |
|
22 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
18 ? file1.orig |
23 ? file1.orig |
19 016807e6fdaf tip |
24 016807e6fdaf tip |