Viewing all changes in revision 5425.
- Committer: Gordon Tyler
- Date: 2011-02-27 14:11:58 UTC
- Revision ID: gordon@doxxx.net-20110227141158-k9v8lnq5pjtf0b8v
Make it clear that it's a merge tool action.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
