Viewing all changes in revision 4597.3.68.
- Committer: Vincent Ladeuil
- Date: 2010-02-02 17:29:50 UTC
- mto: (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20100202172950-eh5ize8azzf0ril3
Don't use rest syntax for text displayed as-is to users.
* bzrlib/help_topics/en/conflict-types.txt:
Despite apparences, this is displayed as is to the user and should
*not* use any fancy rest syntax (and that means no comments
either).
* bzrlib/help_topics/en/conflict-types.txt:
Despite apparences, this is displayed as is to the user and should
*not* use any fancy rest syntax (and that means no comments
either).
expand all
collapse all
added
removed
