Blocked revisions 83675,85087,85178 via svnmerge

........
  r83675 | r.david.murray | 2010-08-03 13:56:09 -0400 (Tue, 03 Aug 2010) | 12 lines

  #9444: use first of prefix_chars for help opt instead of raising error

  An argparse option parser created with a prefix_chars that did not
  include a '-' would happily add -h and --help options, and then throw
  an error when it tried to format the help because the - was an invalid
  prefix character.  This patch makes it use the first character of
  prefix_chars as the character for the help options if and only if '-'
  is not one of the valid prefix_chars.

  Fix by Theodore Turocy, unit tests by Catherine Devlin.
........
  r85087 | r.david.murray | 2010-09-28 21:22:20 -0400 (Tue, 28 Sep 2010) | 2 lines

  Have test_sqlite print version info when run in verbose mode.
........
  r85178 | r.david.murray | 2010-10-02 09:29:13 -0400 (Sat, 02 Oct 2010) | 2 lines

  Make the printing of sqlite version in verbose mode work with regrtest -w.
........