Mercurial > hg

diff tests/test-merge7.out @ 2979: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-merge7.out	Tue Aug 22 19:12:09 2006 -0500
+++ b/tests/test-merge7.out	Tue Aug 22 19:32:16 2006 -0500
@@ -23,7 +23,7 @@
 merge: warning: conflicts during merge
 resolving manifests
  overwrite None branchmerge True partial False linear False
- ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
+ ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9
  test.txt versions differ, resolve
 merging test.txt
 resolving test.txt