tests/test-rename-dir-merge2.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 13 Mar 2007 15:02:33 -0300
changeset 4204 f9bbcebcacea
parent 4117 c95060a5391a
child 4311 4787e2b0dd03
permissions -rw-r--r--
"default" is the default branch name

adding a/f
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
copying a/f to b/f
removing a/f
adding a/aa/g
pulling from ../r2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b/f
A b/aa/g
  a/aa/g
R a/aa/g
R a/f