Mercurial > hg
view tests/test-merge8.out @ 7421:4c4324476be6
Catch both IOError and OSError, fix regression introduced by 8046f0a070a6
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 26 Nov 2008 18:23:35 +0100 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
line wrap: on
line source
updating working directory 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