To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/tests/test_conflicts.py
- Committer: John Arbash Meinel
- Date: 2010-01-12 22:36:23 UTC
- mfrom: (4953 +trunk)
- mto: This revision was merged to the branch mainline in revision 4955.
- Revision ID: john@arbash-meinel.com-20100112223623-836x5mou0gm5vsep
merge bzr.dev 4953 to clean up the ui factory issues
- files added:
- bzrlib/help_topics/es
- contrib/debian
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflicts.txt
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- files modified:
- Makefile
added
removed
bzrlib/tests/test_conflicts.py
