| changeset 1637 | 3b1b44b917f4 |
| parent 925 | 5a034646e472 |
| child 1933 | 7544700fd931 |
| 1636:7da32bb3d1d3 | 1637:3b1b44b917f4 |
|---|---|
9 merging file1 |
9 merging file1 |
10 merging file1 failed! |
10 merging file1 failed! |
11 diff -r f4d7a8c73d23 file1 |
11 diff -r f4d7a8c73d23 file1 |
12 --- a/file1 |
12 --- a/file1 |
13 +++ b/file1 |
13 +++ b/file1 |
14 @@ -1,3 +1,7 @@ |
14 @@ -1,3 +1,7 @@ added file1 |
15 added file1 |
15 added file1 |
16 another line of text |
16 another line of text |
17 +<<<<<<< |
17 +<<<<<<< |
18 +changed file1 different |
18 +changed file1 different |
19 +======= |
19 +======= |