Restructure option handling -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Restructure option handling This allows global options to appear before or after the command name Also includes a patch from Andrew Thompson <andrewkt@aktzero.com> to catch invalid global options. manifest hash: 2a1285c0caf04ae79dca10cb899d183d84a6f3d4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx80cywK+sNU5EO8RApJSAJ9U6ijOIbMDAd4lcahY6dXCTPcsNACeKuNT iVhCp9IvacwwuHjAFXsLJEQ= =Q9Qe -----END PGP SIGNATURE-----

+ hg init
+ echo nothing
+ hg add a
+ hg commit -t ancestor -u test -d '0 0'
+ echo something
+ hg commit -t branch1 -u test -d '0 0'
+ hg co 0
+ echo 'something else'
+ hg commit -t branch2 -u test -d '0 0'
+ export HGMERGE=merge
+ HGMERGE=merge
+ hg up -m 1
merge: warning: conflicts during merge
merging a
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
+ grep -Ev '>>>|<<<' a
something else
=======
something
+ hg status
C a
? .out