Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8.out @ 3619:7d3d603e7df9
localrepo: factor commit and rawcommit
note: rawcommit with an empty text will now launch the editor
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 07 Nov 2006 21:43:19 +0100 |
parents | efbe24c7d8d9 |
children | 9103dab96093 |
line wrap: on
line source
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