Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge7.out @ 2830:49988d9f0758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew, fix most tests
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 13:55:18 -0500
parents e506c14382fd
children 92a0c2200e41
line wrap: on
line diff
--- a/tests/test-merge7.out
+++ b/tests/test-merge7.out
@@ -22,7 +22,7 @@ added 1 changesets with 1 changes to 1 f
 (run 'hg heads' to see heads, 'hg merge' to merge)
 merge: warning: conflicts during merge
 resolving manifests
- force False allow True moddirstate True linear False
+ overwrite None branchmerge True partial False linear False
  ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
  test.txt versions differ, resolve
 merging test.txt