Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3796:a0d0d24c4e71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed unused parameters/options of update command.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 05 Dec 2006 22:46:36 +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