Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.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 b2ae81a7df29
children
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)