| changeset 4387 | 93a4e72b4f83 |
| parent 4365 | 46280c004f22 |
| child 12156 | 4c94b6d0fb1c |
| 4386:1386a9cffc88 | 4387:93a4e72b4f83 |
|---|---|
25 hg status |
25 hg status |
26 hg id |
26 hg id |
27 hg update -C 0 |
27 hg update -C 0 |
28 echo "changed file1 different" >> file1 |
28 echo "changed file1 different" >> file1 |
29 hg update |
29 hg update |
30 hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" |
30 hg diff --nodates |
31 hg status |
31 hg status |
32 hg id |
32 hg id |
33 hg revert --no-backup --all |
33 hg revert --no-backup --all |
34 hg diff |
34 hg diff |
35 hg status |
35 hg status |