Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-dir-merge2.out @ 5459:b0e5f44fdeb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t. See also PEP 353. NOTE: Microsoft compilers (8 or earlier) does not have ssize_t.
author Shun-ichi GOTO <shunichi.goto@gmail.com>
date Fri, 12 Oct 2007 11:46:49 +0900
parents bb1800a7d7e1
children
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