« back to all changes in this revision
Viewing changes to bzrlib/help_topics/en/log-formats.txt
- Committer: John Arbash Meinel
- Date: 2010-02-17 17:11:16 UTC
- mfrom: (4797.2.17 2.1)
- mto: (4797.2.18 2.1)
- mto: This revision was merged to the branch mainline in revision 5055.
- Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.
- files added:
- MANIFEST.in
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- contrib/debian
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- files removed:
- bzrlib/textui.py
- 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/help_topics/en/log-formats.txt
