Viewing all changes in revision 6319.

Committer: Patch Queue Manager
Date: 2011-11-28 19:47:49 UTC
mfrom: <a title="Merged From 6259.3.5" href="/~bzr-pqm/bzr/bzr.dev/revision/6259.3.5?remember=5401">(6259.3.5 move_merge_type_registry)
Revision ID: pqm@pqm.ubuntu.com-20111128194749-ngknllszanig1epd

(gz) Move merge_type_registry from bzrlib.options to bzrlib.merge (Martin
Packman)

added added

removed removed