Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2 @ 4385:93a4e72b4f83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 28 Apr 2007 17:55:45 -0300
parents 46280c004f22
children
comparison
equal deleted inserted replaced
4384:1386a9cffc88 4385: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