Mercurial > hg
view tests/test-merge8.out @ 5242:9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 25 Aug 2007 11:30:11 +0200 |
parents | bb1800a7d7e1 |
children | 0750f11152fe |
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) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved