From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22837 invoked by alias); 26 Oct 2002 17:05:05 -0000 Mailing-List: contact gdb-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sources.redhat.com Received: (qmail 22788 invoked from network); 26 Oct 2002 17:05:05 -0000 Received: from unknown (HELO crack.them.org) (65.125.64.184) by sources.redhat.com with SMTP; 26 Oct 2002 17:05:05 -0000 Received: from nevyn.them.org ([66.93.61.169] ident=mail) by crack.them.org with asmtp (Exim 3.12 #1 (Debian)) id 185VIb-0004jE-00; Sat, 26 Oct 2002 13:04:37 -0500 Received: from drow by nevyn.them.org with local (Exim 3.36 #1 (Debian)) id 185UNR-0002Ej-00; Sat, 26 Oct 2002 13:05:33 -0400 Date: Sat, 26 Oct 2002 10:05:00 -0000 From: Daniel Jacobowitz To: gdb@sources.redhat.com Cc: kseitz@redhat.com, irox@redhat.com Subject: Conflict markers in tcl/ChangeLog Message-ID: <20021026170532.GA8429@nevyn.them.org> Mail-Followup-To: gdb@sources.redhat.com, kseitz@redhat.com, irox@redhat.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.1i X-SW-Source: 2002-10/txt/msg00189.txt.bz2 Are the conflict markers in tcl/ChangeLog really supposed to be there? They were introduced in the 8.3 merge last September and have been sitting there since. I was doing a branch merge for drow-cplus-branch today and noticed them. -- Daniel Jacobowitz MontaVista Software Debian GNU/Linux Developer