To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 6543.2.3.
- Committer: Martin Packman
- Date: 2012-07-27 17:44:29 UTC
- mto: (7290.25.1 resolve-auto-refactor)
- mto: This revision was merged to the branch mainline in revision 7351.
- Revision ID: martin.packman@canonical.com-20120727174429-10d8t8vvwolgkwl8
Use tree.get_file rather than touching filesystem directly to auto resolve
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
