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 46614D3EF for ; Sat, 4 Aug 2012 12:37:04 +0000 (UTC) Received: (qmail 93010 invoked by uid 500); 4 Aug 2012 12:37:04 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 92928 invoked by uid 500); 4 Aug 2012 12:37:03 -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 92914 invoked by uid 99); 4 Aug 2012 12:37:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Aug 2012 12:37:03 +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; Sat, 04 Aug 2012 12:37:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2BD792388962; Sat, 4 Aug 2012 12:36:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1369306 - /subversion/trunk/subversion/svn/file-merge.c Date: Sat, 04 Aug 2012 12:36:17 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120804123617.2BD792388962@eris.apache.org> Author: stsp Date: Sat Aug 4 12:36:16 2012 New Revision: 1369306 URL: http://svn.apache.org/viewvc?rev=1369306&view=rev Log: * subversion/svn/file-merge.c (merge_chunks): Slight wording tweak in file merge menu prompt. Modified: subversion/trunk/subversion/svn/file-merge.c Modified: subversion/trunk/subversion/svn/file-merge.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1369306&r1=1369305&r2=1369306&view=diff ============================================================================== --- subversion/trunk/subversion/svn/file-merge.c (original) +++ subversion/trunk/subversion/svn/file-merge.c Sat Aug 4 12:36:16 2012 @@ -651,7 +651,7 @@ merge_chunks(apr_array_header_t **merged " (e2) edit your version and use the result,\n" " (eb) edit both versions and use the result,\n" " (p) postpone this conflicting section leaving conflict markers,\n" - " (a) abort entire merge and return to main menu: ")); + " (a) abort file merge and return to main menu: ")); /* Now let's see what the user wants to do with this conflict. */ while (TRUE)