equal
deleted
inserted
replaced
3 A a |
3 A a |
4 a |
4 a |
5 % test case collision on rename (issue 750) |
5 % test case collision on rename (issue 750) |
6 adding a |
6 adding a |
7 a |
7 a |
8 committed changeset 07f494440405 |
|
9 A: not overwriting - file exists |
8 A: not overwriting - file exists |
10 % test case collision between revisions (issue 912) |
9 % test case collision between revisions (issue 912) |
11 adding a |
10 adding a |
12 adding A |
11 adding A |
13 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
12 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |