author | Matt Mackall <mpm@selenic.com> |
Sun, 15 Apr 2007 18:42:38 -0500 | |
changeset 4346 | c593e502f7fd |
parent 4311 | 4787e2b0dd03 |
child 4416 | bb1800a7d7e1 |
permissions | -rw-r--r-- |
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) merging a/f and b/f 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M b/f a/f A b/aa/g a/aa/g R a/aa/g R a/f