Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-update-reverse.out @ 3095:92a0c2200e41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use context code to retrieve manifests
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:32:16 -0500
parents 49988d9f0758
children 40e777bda455
line wrap: on
line diff
--- a/tests/test-update-reverse.out
+++ b/tests/test-update-reverse.out
@@ -41,7 +41,7 @@ side1
 side2
 resolving manifests
  overwrite True branchmerge False partial False linear False
- ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae
+ ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d
 remote deleted side2, clobbering
 remote deleted side1, clobbering
 remote created main