subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1398304 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Mon, 15 Oct 2012 14:30:43 GMT
Author: stsp
Date: Mon Oct 15 14:30:42 2012
New Revision: 1398304

URL: http://svn.apache.org/viewvc?rev=1398304&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Restore ability to run the merge tool with a smiley
   face at the conflict prompt. Fixes regression introduced in r1398147 :-)

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1398304&r1=1398303&r2=1398304&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Oct 15 14:30:42 2012
@@ -477,8 +477,8 @@ handle_text_conflict(svn_wc_conflict_res
           if (performed_edit)
             knows_something = TRUE;
         }
-      else if (strcmp(answer, "m") == 0 || strcmp(answer, "=>-") == 0
-               || strcmp(answer, ":>.") == 0)
+      else if (strcmp(answer, "m") == 0 || strcmp(answer, ":-g") ||
+               strcmp(answer, "=>-") == 0 || strcmp(answer, ":>.") == 0)
         {
           if (desc->kind != svn_wc_conflict_kind_text)
             {



Mime
View raw message