From: Andrew Cagney <ac131313@redhat.com>
To: Daniel Jacobowitz <drow@mvista.com>
Cc: gdb@sources.redhat.com, kseitz@redhat.com, irox@redhat.com
Subject: Re: Conflict markers in tcl/ChangeLog
Date: Sat, 26 Oct 2002 10:17:00 -0000 [thread overview]
Message-ID: <3DBACDB3.4070603@redhat.com> (raw)
In-Reply-To: <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
prev parent reply other threads:[~2002-10-26 17:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-10-26 10:05 Daniel Jacobowitz
2002-10-26 10:17 ` Andrew Cagney [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3DBACDB3.4070603@redhat.com \
--to=ac131313@redhat.com \
--cc=drow@mvista.com \
--cc=gdb@sources.redhat.com \
--cc=irox@redhat.com \
--cc=kseitz@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox