Mercurial > hg
diff tests/test-merge-types.out @ 8753:af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Jun 2009 18:14:44 -0500 |
| parents | 8dca507e56ce |
| children | ba5e508b5e92 |
line wrap: on
line diff
--- a/tests/test-merge-types.out Mon Jun 08 18:14:44 2009 -0500 +++ b/tests/test-merge-types.out Mon Jun 08 18:14:44 2009 -0500 @@ -1,10 +1,10 @@ adding a 0 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head + searching for copies back to rev 1 resolving manifests overwrite None partial False ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c - searching for copies back to rev 1 conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e @@ -13,10 +13,10 @@ % 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 + searching for copies back to rev 1 resolving manifests overwrite None partial False ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f - searching for copies back to rev 1 conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g