« back to all changes in this revision
Viewing changes to bzrlib/plugins/news_merge/parser.py
- Committer: Vincent Ladeuil
- Date: 2010-01-16 10:10:12 UTC
- mfrom: (4597.6.3 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-20100116101012-1voidp4u4o0g2psn
Merge description into dont-add-conflict-helpers
- files added:
- MANIFEST.in
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- bzrlib/help_topics/es/conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- files modified:
- Makefile
added
removed
bzrlib/plugins/news_merge/parser.py
