To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

Viewing all changes in revision 6282.3.3.

Committer: Vincent Ladeuil
Date: 2011-11-28 16:31:24 UTC
mto: <a title="Merged In 6321.1.1" href="/bzr/brz/remove-bazaar/revision/6321.1.1?remember=1663">(6321.1.1 trunk)
mto: This revision was merged to the branch mainline in revision 6322 .
Revision ID: v.ladeuil+lp@free.fr-20111128163124-u6ji7qtvcd8lsh80

Change option scheme so users mainly have to deal with po_merge.po_dirs only.

files renamed:
bzrlib/plugins/po_merge/tests/test_blackbox_po_merge.py => bzrlib/plugins/po_merge/tests/test_po_merge.py

added added

removed removed