« back to all changes in this revision
Viewing changes to bzrlib/ui/text.py
- Committer: Robert Collins
- Date: 2005-10-06 22:15:52 UTC
- mfrom: (1185.13.2)
- mto: This revision was merged to the branch mainline in revision 1420.
- Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
merge from upstream
- files added:
- bzrlib/plugins/conflicts.py
- files modified:
- .bzrignore
added
removed
bzrlib/ui/text.py
