To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 1652.1.1.
- Committer: Martin Pool
- Date: 2006-04-12 04:52:02 UTC
- mto: This revision was merged to the branch mainline in revision 1656.
- Revision ID: mbp@sourcefrog.net-20060412045202-5920585dfd719c7b
Fix 'bzr resolve' run from subdirectory
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
