Mercurial > hg

view tests/test-merge-types.out @ 5900:1206e3dfc906

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repair.py: nodes are nodes, revs are revs Use "striprev" instead of just "rev" to make the patch a bit less confusing. This is also a bit clearer than just "revnum".
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 19 Jan 2008 18:01:16 -0200
parents 026eb80060d8
children 4b0c9c674707
line wrap: on
line source

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)