merge

The merge script seems to be out of sync.  This fix worked for me:

diff -w -u -r1.5 merge
--- merge	8 May 2003 01:35:29 -0000	1.5
+++ merge	21 Jun 2003 23:44:29 -0000
@@ -107,7 +107,7 @@
      modules = [("errors",        "class OptikError"),
                 ("help",          "class HelpFormatter"),
                 ("option",        "_builtin_cvt"),
-               ("option_parser", "def get_prog_name")]
+               ("option_parser", "SUPPRESS_HELP")]

      for (name, s) in modules:
          infile = open_module(name)

-- David Goodger



-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php