Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3686:4308f4cdc07b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes