Viewing all changes in revision 4597.3.71.
- Committer: Vincent Ladeuil
- Date: 2010-02-04 13:04:01 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-20100204130401-droqjyqwbnmfq84t
As per review comments, put back the light rest markup allowed.
- files modified:
- bzrlib/help_topics/en/conflict-types.txt
expand all
collapse all
added
removed
