| changeset 5863 | 3d1f9dcecdea |
| parent 4387 | 93a4e72b4f83 |
| child 6004 | 5af5f0f9d724 |
| 5861:b860b116dea4 | 5863:3d1f9dcecdea |
|---|---|
18 hg update 0 |
18 hg update 0 |
19 hg update 1 |
19 hg update 1 |
20 diff -r f248da0d4c3e file1 |
20 diff -r f248da0d4c3e file1 |
21 --- a/file1 |
21 --- a/file1 |
22 +++ b/file1 |
22 +++ b/file1 |
23 @@ -1,3 +1,7 @@ added file1 |
23 @@ -1,3 +1,7 @@ |
24 added file1 |
24 added file1 |
25 another line of text |
25 another line of text |
26 +<<<<<<< my |
26 +<<<<<<< my |
27 +changed file1 different |
27 +changed file1 different |
28 +======= |
28 +======= |