Mercurial > hg
view tests/test-merge4.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 | b2ae81a7df29 |
children | 4b0c9c674707 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)