subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1241493 - /subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c
Date Tue, 07 Feb 2012 15:44:40 GMT
Author: stsp
Date: Tue Feb  7 15:44:40 2012
New Revision: 1241493

URL: http://svn.apache.org/viewvc?rev=1241493&view=rev
Log:
On the moves-scan-log branch:

* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Fix reversed logic in help text of the
   move conflict prompt.

Modified:
    subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c

Modified: subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c?rev=1241493&r1=1241492&r2=1241493&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/moves-scan-log/subversion/svn/conflict-callbacks.c Tue Feb  7 15:44:40
2012
@@ -1023,8 +1023,8 @@ svn_cl__conflict_handler(svn_wc_conflict
           desc->reason == svn_wc_conflict_reason_moved_here)
         help_text = 
           _("  (p)  postpone        - resolve the conflict later\n"
-            "  (mc) mine-conflict   - use incoming move\n"
-            "  (tc) theirs-conflict - use local move\n"
+            "  (mc) mine-conflict   - use local move\n"
+            "  (tc) theirs-conflict - use incoming move\n"
             "  (ci) change-incoming - change incoming move target\n"
             "  (cl) change-local    - change local move target\n"
             "  (h)  help            - show this help\n\n");



Mime
View raw message