Rev 2272: Use a Registry for merge-type options in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2272
revision-id: pqm at pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
parent: pqm at pqm.ubuntu.com-20070207225551-26a710f4cc2f19a6
parent: abentley at panoramicfeedback.com-20070207161056-iouamzaiam0ru7mf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-07 23:06:59 +0000
message:
  Use a Registry for merge-type options
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070207161056-iouamzaiam0ru7mf
    parent: abentley at panoramicfeedback.com-20070207160509-654375dogb1dva62
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: registryoption
    timestamp: Wed 2007-02-07 11:10:56 -0500
    message:
      PEP8-ness
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070207160509-654375dogb1dva62
    parent: abentley at panoramicfeedback.com-20070207153835-w2ydh6x5ejdxf8p0
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: registryoption
    timestamp: Wed 2007-02-07 11:05:09 -0500
    message:
      Add tests for get_merge_type_registry
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070207153835-w2ydh6x5ejdxf8p0
    parent: abentley at panoramicfeedback.com-20070207140301-6q963t7uhgf10utg
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: registryoption
    timestamp: Wed 2007-02-07 10:38:35 -0500
    message:
      Use RegistryOption for merge type