Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4734:9ac493f12901

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Abort if earlygetopt fails to detect an option. Otherwise it could happen that a command is used on the wrong repository, because abbreviations of --cwd or --repository were ignored.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 28 Jun 2007 16:03:45 +0200
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