You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/07/08 15:13:42 UTC
svn propchange: r1492152 - svn:log
Author: stsp
Revision: 1492152
Modified property: svn:log
Modified: svn:log at Mon Jul 8 13:13:42 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Mon Jul 8 13:13:42 2013
@@ -7,4 +7,6 @@ See http://svn.haxx.se/dev/archive-2013-
* subversion/svn/conflict-callbacks.c
(tree_conflict_options_update_edit_moved_away): Remove the 'r' option from
- the menu, it won't be needed in the usual case.
+ the menu, it won't be needed in the usual case. While here, tweak the
+ wording of the "mc" option description to more clearly explain the
+ effect of this option.