Mercurial > hg
view tests/test-rename-after-merge.out @ 6061:de08788511d7
test-keyword: make it run under Windows
- don't cat symlink, content differs
- rewrite OS specific messages
- generate symlink with a bundle
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 09 Feb 2008 20:17:09 +0100 |
parents | 784eadabd985 |
children | 0750f11152fe |
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) M b % rename b as c A c R b % rename back c as b M b