Mercurial > hg
view tests/test-rename-dir-merge2.out @ 8820:e8cb1fa0d4a9
test-convert-cvsnt-mergepoints: make it work on OS X.
- don't create file 'cvs' where directory 'CVS' already exists
| author | Greg Ward <greg-hg@gerg.ca> |
|---|---|
| date | Mon, 15 Jun 2009 20:35:19 -0400 |
| parents | 0750f11152fe |
| children | a3d73b3e1f8a |
line wrap: on
line source
adding a/f updating working directory 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