Viewing all changes in revision 1852.12.1.
- Committer: Robert Collins
- Date: 2006-07-14 05:28:17 UTC
- mto: (1852.13.1 WorkingTree Format 4)
- mto: This revision was merged to the branch mainline in revision 1896.
- Revision ID: robertc@robertcollins.net-20060714052817-76f18c3e784ed1ef
Status should not special case conflicts on the tree type, rather just show the new trees conflicts regardless.
- files modified:
- bzrlib/status.py
expand all
collapse all
added
removed
