Mercurial > public > mercurial-scm > hg

diff tests/test-merge-types.out @ 5710:026eb80060d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update test-merge-types
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 23:55:36 -0600
parents 305b035c5fda
children 4b0c9c674707
line wrap: on
line diff
--- a/tests/test-merge-types.out	Thu Dec 27 22:49:01 2007 -0600
+++ b/tests/test-merge-types.out	Thu Dec 27 23:55:36 2007 -0600
@@ -1,1 +1,22 @@
-### This test is for a known, unfixed bug ###
+adding a
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+resolving manifests
+ overwrite None partial False
+ ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
+  searching for copies back to rev 1
+ a: update permissions -> e
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% symlink is local parent, executable is other
+a has no flags (default for conflicts)
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+resolving manifests
+ overwrite None partial False
+ ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
+  searching for copies back to rev 1
+ a: remote is newer -> g
+getting a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% symlink is other parent, executable is local
+a has no flags (default for conflicts)