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 C23AE9616 for ; Thu, 26 Apr 2012 17:59:21 +0000 (UTC) Received: (qmail 83394 invoked by uid 500); 26 Apr 2012 17:59:21 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 83367 invoked by uid 500); 26 Apr 2012 17:59:21 -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 83360 invoked by uid 99); 26 Apr 2012 17:59:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2012 17:59:21 +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; Thu, 26 Apr 2012 17:59:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E116F23889E1; Thu, 26 Apr 2012 17:58:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1330996 - /subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py Date: Thu, 26 Apr 2012 17:58:57 -0000 To: commits@subversion.apache.org From: danielsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120426175857.E116F23889E1@eris.apache.org> Author: danielsh Date: Thu Apr 26 17:58:57 2012 New Revision: 1330996 URL: http://svn.apache.org/viewvc?rev=1330996&view=rev Log: * subversion/tests/cmdline/./merge_symmetric_tests.py: Correct file name in comment. Modified: subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py Modified: subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py?rev=1330996&r1=1330995&r2=1330996&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py Thu Apr 26 17:58:57 2012 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# merge_tests.py: testing "symmetric merge" scenarios +# merge_symmetric_tests.py: testing "symmetric merge" scenarios # # Subversion is a tool for revision control. # See http://subversion.apache.org for more information.