Author: stsp Revision: 1492682 Modified property: svn:log Modified: svn:log at Thu Jun 13 14:29:39 2013 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Thu Jun 13 14:29:39 2013 @@ -3,5 +3,7 @@ Merge two very similar interactive confl * subversion/svn/conflict-callbacks.c (tree_conflict_options_update_edit_moved_away): Merge this menu with ... (tree_conflict_options_update_moved_away): .. this one. They weren't - sufficiently different anymore to justify the separation. + sufficiently different anymore to justify the separation. This also + removes the 'r' option, which shouldn't really be used when resolving + tree conflicts involving moves, from this menu. (handle_tree_conflict): Track above change.
