Viewing all changes in revision 6544.
- Committer: Martin Packman
- Date: 2012-07-27 11:47:54 UTC
- Revision ID: martin.packman@canonical.com-20120727114754-qazj408jbcowhlkf
Refactor auto_resolve tree method into auto action on conflicts
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
