Mercurial > hg
view tests/test-rename-dir-merge2.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 | 2493a478f395 |
| children | 0750f11152fe |
line wrap: on
line source
adding a/f 1 files updated, 0 files merged, 0 files removed, 0 files unresolved moving a/f to b/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