This is the mail archive of the gdb@sources.redhat.com mailing list for the GDB project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: Conflict markers in tcl/ChangeLog

From: Andrew Cagney <ac131313 at redhat dot com>
To: Daniel Jacobowitz <drow at mvista dot com>
Cc: gdb at sources dot redhat dot com, kseitz at redhat dot com, irox at redhat dot com
Date: Sat, 26 Oct 2002 13:15:31 -0400
Subject: Re: Conflict markers in tcl/ChangeLog
References: <20021026170532.GA8429@nevyn.them.org>

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.

Clearly they're intentional :-^. (It would be a straight foobar so if you wan't to pull them :-)
Andrew

References:
- Conflict markers in tcl/ChangeLog
  - From: Daniel Jacobowitz

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]