Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-dir-merge2.out @ 4205:a7af0eeae8a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move branches.cache to branch.cache Keeps old clients from conflicting with new caches, makes features logic unnecessary.
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2007 15:18:10 -0500
parents c95060a5391a
children 4787e2b0dd03
line wrap: on
line source

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