tests/test-up-local-change.out

--- a/tests/test-up-local-change.out	Mon Sep 26 14:01:18 2005 -0700
+++ b/tests/test-up-local-change.out	Mon Sep 26 16:52:47 2005 -0700
@@ -15,7 +15,7 @@
 getting b
 merging a
 resolving a
-file a: other d730145abbf9 ancestor b789fdd96dc2
+file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
 resolving manifests
  force None allow 1 moddirstate True linear True
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e