Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge7.out @ 3111:40e777bda455
merge: remove linear variable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 17:13:02 -0500 |
parents | 92a0c2200e41 |
children | 2ef0b3aae186 |
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 - overwrite None branchmerge True partial False linear False + overwrite None branchmerge True partial False ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 test.txt versions differ, resolve merging test.txt