Viewing all changes in revision 4927.2.1.
- Committer: Ian Clatworthy
- Date: 2010-01-03 01:41:00 UTC
- mto: (4944.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4945.
- Revision ID: ian.clatworthy@canonical.com-20100103014100-7240p8r4tl347nrj
conflicts topic renamed to conflict-types and other minor help clean-ups
- files renamed:
- bzrlib/help_topics/en/conflicts.txt => bzrlib/help_topics/en/conflict-types.txt
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
