« back to all changes in this revision
Viewing changes to bzrlib/patiencediff.py
- Committer: Jelmer Vernooij
- Date: 2011-05-10 07:46:15 UTC
- mfrom: (5844 +trunk)
- mto: This revision was merged to the branch mainline in revision 5845.
- Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.
- files added:
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- files removed:
- bzrlib/tests/per_interbranch/test_update_revisions.py
- files renamed:
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- files modified:
- Makefile
added
removed
bzrlib/patiencediff.py
