« back to all changes in this revision
Viewing changes to bzrlib/shelf.py
- Committer: Neil Martinsen-Burrell
- Date: 2009-11-25 16:04:57 UTC
- mto: This revision was merged to the branch mainline in revision 4843.
- Revision ID: nmb@wartburg.edu-20091125160457-56y1yl8iw4y9q4x8
Add discussion of conflicts
- files added:
- bzrlib/textui.py
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_bzrdir_colo
- contrib/debian
- doc/en/whats-new
- files renamed:
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/shelf.py
