« back to all changes in this revision
Viewing changes to doc/en/user-guide/index-plain.txt
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-03-02 08:49:07 UTC
- mfrom: (5067.1.1 integration)
- Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file
- files added:
- .testr.conf
- bzrlib/help_topics/es
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_uifactory
- contrib/apport
- contrib/debian
- doc/en/whats-new
- 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/conflict-types.txt
- bzrlib/tests/test_bencode.py => bzrlib/tests/test__bencode.py
- files modified:
- .bzrignore
added
removed
doc/en/user-guide/index-plain.txt
