subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1398147 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Sun, 14 Oct 2012 23:20:48 GMT
Author: danielsh
Date: Sun Oct 14 23:20:48 2012
New Revision: 1398147

URL: http://svn.apache.org/viewvc?rev=1398147&view=rev
Log:
Easter egg.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Use ASCII art rather than :-[A-Z].

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=1398147&r1=1398146&r2=1398147&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Sun Oct 14 23:20:48 2012
@@ -477,7 +477,8 @@ handle_text_conflict(svn_wc_conflict_res
           if (performed_edit)
             knows_something = TRUE;
         }
-      else if (strcmp(answer, "m") == 0 || strcmp(answer, ":-M") == 0)
+      else if (strcmp(answer, "m") == 0 || strcmp(answer, "=>-") == 0
+               || strcmp(answer, ":>.") == 0)
         {
           if (desc->kind != svn_wc_conflict_kind_text)
             {



Mime
View raw message