Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert @ 3098:fe9b13e35e46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Sep 2006 15:22:45 -0500
parents 890e285c52a1
children 9dcf9d45cab8
line wrap: on
line diff
--- a/tests/test-merge-revert
+++ b/tests/test-merge-revert
@@ -15,7 +15,7 @@ hg update -C 0
 hg id
 echo "changed file1" >> file1
 hg id
-hg revert
+hg revert --all
 hg diff
 hg status
 hg id
@@ -29,11 +29,11 @@ HGMERGE=merge hg update
 hg diff
 hg status
 hg id
-hg revert
+hg revert --all
 hg diff
 hg status
 hg id
-hg revert -r tip
+hg revert -r tip --all
 hg diff
 hg status
 hg id