[merge] Allow '-' as an argument

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

https://launchpad.net/products/bzr/+bug/50984

The current argument parsing code borks if you do:

bzr command -

Because it starts to think it is a short option, but has no argument.
At present, no commands support '-' (for say reading from stdin). But
the argument parser should support it. Especially so that plugins can
support reading from stdin. (And in the future bzr merge/bzr pull should
probably allow bundles to be piped in for cat bundle | bzr merge -, but
that is not done yet).

The attached patch just adds a test that '-' is valid as a command line
argument, and gets parsed as an argument rather than an option.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEtBzZJdeBCYSNAAMRAi2+AJ9Ml+YC2FwCLWn8A5EtWtJX31SloQCfZDB3
zIKyMIzrYQGLSGAo9ByL/0I=
=WH/V
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dash-arg-50984.patch
Type: text/x-patch
Size: 2017 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060711/2d3d951e/attachment.bin