Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7C268DEEF for ; Sun, 14 Oct 2012 23:21:33 +0000 (UTC) Received: (qmail 92151 invoked by uid 500); 14 Oct 2012 23:21:33 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 92129 invoked by uid 500); 14 Oct 2012 23:21:33 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 92117 invoked by uid 99); 14 Oct 2012 23:21:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Oct 2012 23:21:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Oct 2012 23:21:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D6D7623888FE; Sun, 14 Oct 2012 23:20:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1398147 - /subversion/trunk/subversion/svn/conflict-callbacks.c Date: Sun, 14 Oct 2012 23:20:48 -0000 To: commits@subversion.apache.org From: danielsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121014232048.D6D7623888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {