Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert @ 4361:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4360:d5c3a70f8422 4361:46280c004f22
23 hg diff 23 hg diff
24 hg status 24 hg status
25 hg id 25 hg id
26 hg update -C 0 26 hg update -C 0
27 echo "changed file1" >> file1 27 echo "changed file1" >> file1
28 HGMERGE=merge hg update 28 hg update
29 hg diff 29 hg diff
30 hg status 30 hg status
31 hg id 31 hg id
32 hg revert --all 32 hg revert --all
33 hg diff 33 hg diff