From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-116236-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 11865 invoked by alias); 29 Sep 2014 10:29:44 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Received: (qmail 11788 invoked by uid 89); 29 Sep 2014 10:29:43 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL,BAYES_00,LIKELY_SPAM_BODY,RP_MATCHES_RCVD,SPF_PASS,UNPARSEABLE_RELAY autolearn=no version=3.3.2
X-HELO: aserp1040.oracle.com
Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 29 Sep 2014 10:29:42 +0000
Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238])	by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s8TATYho025846	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);	Mon, 29 Sep 2014 10:29:35 GMT
Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230])	by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s8TATYni012677	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);	Mon, 29 Sep 2014 10:29:34 GMT
Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25])	by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s8TATYA5010973;	Mon, 29 Sep 2014 10:29:34 GMT
Received: from termi.oracle.com (/10.175.164.118)	by default (Oracle Beehive Gateway v4.0)	with ESMTP ; Mon, 29 Sep 2014 03:29:33 -0700
From: jose.marchesi@oracle.com (Jose E. Marchesi)
To: Eli Zaretskii <eliz@gnu.org>
Cc: gdb-patches@sourceware.org
Subject: Re: [PATCH 9/9] Announce the DTrace USDT probes support in NEWS.
References: <no@[87.69.4.28]>	<1411724905-31234-1-git-send-email-jose.marchesi@oracle.com>	<1411724905-31234-10-git-send-email-jose.marchesi@oracle.com>	<83ppeittjl.fsf@gnu.org>
Date: Mon, 29 Sep 2014 10:29:00 -0000
In-Reply-To: <83ppeittjl.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 26 Sep	2014 16:12:14 +0300")
Message-ID: <87sija7m15.fsf@oracle.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-IsSubscribed: yes
X-SW-Source: 2014-09/txt/msg00827.txt.bz2

    
    > Conflicts:
    > 	gdb/NEWS
    
    What is this about?

One of these stupid comments that git-cherry-pick generates in the log
if there is a conflict in the merge.  I just forgot to delete it.