Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4716:36d23de02da1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make earlygetopt return a list of all option values, use the last value. This fixes: "hg -R" showing a useful error instead of traceback "hg -R foo --repository bar" using bar instead of foo And provides a way for other users of earlygetopt to accept more than one value.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 25 Jun 2007 22:08:10 +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