Viewing all changes in revision 1442.1.7.
- Committer: Robert Collins
- Date: 2005-10-14 02:29:29 UTC
- mfrom: (1454)
- mto: This revision was merged to the branch mainline in revision 1456.
- Revision ID: robertc@lifelesslap.robertcollins.net-20051014022929-43937d292327f618
Merge from upstream
- files added:
- bzrlib/selftest/testannotate.py
- files renamed:
- bzrlib/plugins/conflicts.py => bzrlib/conflicts.py
- files modified:
- .rsyncexclude
expand all
collapse all
added
removed
