diff tests/test-merge7.out @ 2283:e506c14382fd

deprecate 'update -m'. use 'merge' instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 14 May 2006 21:07:34 -0700
parents b2ae81a7df29
children 49988d9f0758
line wrap: on
line diff
--- a/tests/test-merge7.out	Sun May 14 17:37:34 2006 -0700
+++ b/tests/test-merge7.out	Sun May 14 21:07:34 2006 -0700
@@ -22,7 +22,7 @@
 (run 'hg heads' to see heads, 'hg merge' to merge)
 merge: warning: conflicts during merge
 resolving manifests
- force None allow 1 moddirstate True linear False
+ force False allow True moddirstate True linear False
  ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
  test.txt versions differ, resolve
 merging test.txt