Mercurial > public > mercurial-scm > hg

diff tests/test-update-reverse.out @ 8734:60fa3371aa75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: pretend ancestor is local to simplify backwards and overwrite
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 482581431dcd
children af5f099d932b
line wrap: on
line diff
--- a/tests/test-update-reverse.out	Mon Jun 08 18:14:44 2009 -0500
+++ b/tests/test-update-reverse.out	Mon Jun 08 18:14:44 2009 -0500
@@ -43,8 +43,8 @@
 resolving manifests
  overwrite True partial False
  ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8
- side2: remote deleted -> r
- side1: remote deleted -> r
+ side2: other deleted -> r
+ side1: other deleted -> r
  main: remote created -> g
 removing side1
 removing side2