Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-update-reverse.out @ 2830:49988d9f0758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew, fix most tests
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 13:55:18 -0500
parents 30f59f4a327e
children 92a0c2200e41
line wrap: on
line diff
--- a/tests/test-update-reverse.out
+++ b/tests/test-update-reverse.out
@@ -40,7 +40,7 @@ a
 side1
 side2
 resolving manifests
- force True allow False moddirstate True linear False
+ overwrite True branchmerge False partial False linear False
  ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae
 remote deleted side2, clobbering
 remote deleted side1, clobbering