equal
deleted
inserted
replaced
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 HGMERGE=merge hg update |
29 HGMERGE=merge hg update |
30 #hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" |
30 hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" |
31 hg diff --nodates | sed -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" |
|
32 hg status |
31 hg status |
33 hg id |
32 hg id |
34 hg revert --no-backup --all |
33 hg revert --no-backup --all |
35 hg diff |
34 hg diff |
36 hg status |
35 hg status |