Mercurial > public > mercurial-scm > hg

diff tests/test-update-reverse.out @ 3121:2ef0b3aae186

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify actions with helper function
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 21:27:30 -0500
parents 40e777bda455
children b16456909a0a
line wrap: on
line diff
--- a/tests/test-update-reverse.out	Sun Sep 17 21:11:26 2006 -0500
+++ b/tests/test-update-reverse.out	Sun Sep 17 21:27:30 2006 -0500
@@ -42,9 +42,9 @@
 resolving manifests
  overwrite True branchmerge False partial False
  ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d
-remote deleted side2, clobbering
-remote deleted side1, clobbering
-remote created main
+ side2: remote deleted -> r
+ side1: remote deleted -> r
+ main: remote created -> g
 getting main
 removing side1
 removing side2