Viewing all changes in revision 5424.
- Committer: Gordon Tyler
- Date: 2011-02-27 14:08:21 UTC
- Revision ID: gordon@doxxx.net-20110227140821-mpf1st62dnmwwflw
cmd_resolve: Changed mergetool user feedback to be consistent with auto mode.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
