This is the mail archive of the
gdb@sources.redhat.com
mailing list for the GDB project.
Conflict markers in tcl/ChangeLog
- From: Daniel Jacobowitz <drow at mvista dot com>
- To: gdb at sources dot redhat dot com
- Cc: kseitz at redhat dot com, irox at redhat dot com
- Date: Sat, 26 Oct 2002 13:05:33 -0400
- Subject: Conflict markers in tcl/ChangeLog
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