Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-update-reverse.out @ 2822:30f59f4a327e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce update helper functions: update, merge, clean, and revert
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 22:54:33 -0500
parents b2ae81a7df29
children 49988d9f0758
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 1 allow None moddirstate True linear False
+ force True allow False moddirstate True linear False
  ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae
 remote deleted side2, clobbering
 remote deleted side1, clobbering