equal
deleted
inserted
replaced
1 1:f248da0d4c3e |
1 1:f248da0d4c3e |
2 0:9eca13a34789 |
2 0:9eca13a34789 |
3 f248da0d4c3e tip |
3 f248da0d4c3e tip |
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 9eca13a34789 |
5 9eca13a34789 |
5 9eca13a34789+ |
6 9eca13a34789+ |
6 reverting file1 |
7 reverting file1 |
7 9eca13a34789 |
8 9eca13a34789 |
|
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8 f248da0d4c3e tip |
10 f248da0d4c3e tip |
|
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9 merge: warning: conflicts during merge |
12 merge: warning: conflicts during merge |
10 merging file1 |
13 merging file1 |
11 merging file1 failed! |
14 merging file1 failed! |
|
15 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
16 There are unresolved merges with locally modified files. |
12 diff -r f248da0d4c3e file1 |
17 diff -r f248da0d4c3e file1 |
13 --- a/file1 |
18 --- a/file1 |
14 +++ b/file1 |
19 +++ b/file1 |
15 @@ -1,3 +1,7 @@ added file1 |
20 @@ -1,3 +1,7 @@ added file1 |
16 added file1 |
21 added file1 |
23 M file1 |
28 M file1 |
24 f248da0d4c3e+ tip |
29 f248da0d4c3e+ tip |
25 reverting file1 |
30 reverting file1 |
26 f248da0d4c3e tip |
31 f248da0d4c3e tip |
27 f248da0d4c3e tip |
32 f248da0d4c3e tip |
|
33 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 f248da0d4c3e tip |
34 f248da0d4c3e tip |