« back to all changes in this revision
Viewing changes to bzrlib/textmerge.py
- Committer: INADA Naoki
- Date: 2011-05-14 09:58:36 UTC
- mfrom: (5830.2.22 i18n-msgextract)
- mto: This revision was merged to the branch mainline in revision 5891.
- Revision ID: songofacandy@gmail.com-20110514095836-38l651fp8bmb4bni
merge from i18n-msgextract
- files added:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files renamed:
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/bzr_distutils.py => tools/build_mo.py
- files modified:
- .bzrignore
added
removed
bzrlib/textmerge.py
