| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Fri, 05 Sep 2008 10:39:19 +0200 | |
| changeset 6986 | 55c16f12908b |
| parent 6338 | 0750f11152fe |
| child 9611 | a3d73b3e1f8a |
| permissions | -rw-r--r-- |
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