* Conflict markers in tcl/ChangeLog
@ 2002-10-26 10:05 Daniel Jacobowitz
2002-10-26 10:17 ` Andrew Cagney
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Jacobowitz @ 2002-10-26 10:05 UTC (permalink / raw)
To: gdb; +Cc: kseitz, irox
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Conflict markers in tcl/ChangeLog
2002-10-26 10:05 Conflict markers in tcl/ChangeLog Daniel Jacobowitz
@ 2002-10-26 10:17 ` Andrew Cagney
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Cagney @ 2002-10-26 10:17 UTC (permalink / raw)
To: Daniel Jacobowitz; +Cc: gdb, kseitz, irox
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-10-26 17:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-10-26 10:05 Conflict markers in tcl/ChangeLog Daniel Jacobowitz
2002-10-26 10:17 ` Andrew Cagney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox