equal
deleted
inserted
replaced
1 1:016807e6fdaf |
1 1:016807e6fdaf |
2 0:eb43f19ff115 |
2 0:eb43f19ff115 |
3 016807e6fdaf tip |
3 016807e6fdaf tip |
4 eb43f19ff115 |
4 eb43f19ff115 |
5 eb43f19ff115+ |
5 eb43f19ff115+ |
|
6 saving current version of file1 as file1.bak |
|
7 reverting file1 |
|
8 ? file1.bak |
6 eb43f19ff115 |
9 eb43f19ff115 |
|
10 ? file1.bak |
7 016807e6fdaf tip |
11 016807e6fdaf tip |
8 merging file1 |
12 merging file1 |
|
13 ? file1.bak |
9 016807e6fdaf tip |
14 016807e6fdaf tip |
|
15 ? file1.bak |
10 016807e6fdaf tip |
16 016807e6fdaf tip |
|
17 ? file1.bak |
11 016807e6fdaf tip |
18 016807e6fdaf tip |
|
19 ? file1.bak |
12 016807e6fdaf tip |
20 016807e6fdaf tip |