Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-after-merge.out @ 5458:cd1a6e7216c5
mpatch: use int rather than ssize_t
We might need to be more clever than this to make Py2.5 happy.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 11 Oct 2007 17:47:04 -0500 |
parents | c6682cdada2f |
children |
line wrap: on
line source
% create source repository adding a % fork source repository 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b % update source repository % merge repositories pulling from ../t2 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) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % rename b as c A c R b % rename back c as b