Mercurial > hg
view tests/test-merge8.out @ 3686:4308f4cdc07b
Don't step into an endless loop when lock file is empty.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 20 Nov 2006 19:36:28 +0100 |
parents | 9103dab96093 |
children | 4787e2b0dd03 |
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