« back to all changes in this revision
Viewing changes to doc/ja/user-guide/organizing_branches.txt
- Committer: Vincent Ladeuil
- Date: 2010-02-03 07:16:21 UTC
- mfrom: (4597.6.4 description)
- mto: (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20100203071621-1bzqu19rk3nyple2
Merge description into dont-add-conflict-helpers
- files added:
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- files removed:
- contrib/fortune
- files modified:
- INSTALL
added
removed
doc/ja/user-guide/organizing_branches.txt
