Mercurial > hg
comparison tests/test-merge-revert2 @ 4365:46280c004f22
change tests to use simplemerge by default
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 16 Apr 2007 20:17:39 -0300 |
| parents | 9dcf9d45cab8 |
| children | 93a4e72b4f83 |
comparison
equal
deleted
inserted
replaced
| 4364:d5c3a70f8422 | 4365:46280c004f22 |
|---|---|
| 24 hg diff | 24 hg diff |
| 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 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 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 |