Viewing all changes in revision 4634.102.3.
- Committer: Ian Clatworthy
- Date: 2009-10-27 09:45:35 UTC
- mto: (4634.103.1 385879)
- mto: This revision was merged to the branch mainline in revision 4857.
- Revision ID: ian.clatworthy@canonical.com-20091027094535-wii07udtqgtsxbp4
Use the working tree for path lookups as Robert suggested. We still need to fall back to the other tree though in the case of files being added.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
