# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1121041176 28800
# Node ID 204328d345f1039c6d5cee959c1a412d74a9be06
# Parent  32f7dc81c07e7f1a3a2dcfc2d5a2741555387e01
Fix up test for update flags



diff -r 32f7dc81c07e -r 204328d345f1 tests/test-up-local-change.out
--- a/tests/test-up-local-change.out	Sun Jul 10 16:17:05 2005 -0800
+++ b/tests/test-up-local-change.out	Sun Jul 10 16:19:36 2005 -0800
@@ -27,6 +27,7 @@
 C a
 + hg --debug up
 resolving manifests
+ force None allow None moddirstate True linear True
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
@@ -36,6 +37,7 @@
 file a: other d730145abbf9 ancestor b789fdd96dc2
 + hg --debug up -m
 resolving manifests
+ force None allow 1 moddirstate True linear True
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6