Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-dir-merge2.out @ 5152:b51d07ed1b18
demandimport: ignore pwd and grp.
Both are unavailable under Windows and tarfile detects them via ImportError.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 13 Aug 2007 19:42:52 +0200 |
| 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