Viewing all changes in revision 974.2.2.
- Committer: aaron.bentley at utoronto
- Date: 2005-08-22 04:35:12 UTC
- mto: (974.1.47)
- mto: This revision was merged to the branch mainline in revision 1178.
- Revision ID: aaron.bentley@utoronto.ca-20050822043512-f4a78ccc9692974f
Handled directories better when merging
- files modified:
- bzrlib/merge_core.py
expand all
collapse all
added
removed
