Mercurial > hg

view tests/test-merge-types.out @ 9594:f0c5c59d878d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with mpm
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sun, 11 Oct 2009 21:32:55 +0200
parents af5f099d932b
children ba5e508b5e92
line wrap: on
line source

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
 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
 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
  searching for copies back to rev 1
resolving manifests
 overwrite None partial False
 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
 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)