author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
Mon, 16 Oct 2006 15:38:53 -0300 | |
changeset 3426 | bb00a5a92c30 |
parent 3389 | efbe24c7d8d9 |
child 3674 | 9103dab96093 |
permissions | -rw-r--r-- |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../a searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (run 'hg update' to get a working copy) merging a and b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved