public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Meissner <meissner@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/meissner/heads/work091)] Update ChangeLog.meissner.
Date: Thu, 16 Jun 2022 21:44:52 +0000 (GMT)	[thread overview]
Message-ID: <20220616214452.0CEF5383F95C@sourceware.org> (raw)

https://gcc.gnu.org/g:a4792f4aa9f871ed1b2de93bdd319bf9aeefb6ff

commit a4792f4aa9f871ed1b2de93bdd319bf9aeefb6ff
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Thu Jun 16 17:40:40 2022 -0400

    Update ChangeLog.meissner.
    
    2022-06-13   Michael Meissner  <meissner@linux.ibm.com>
    
    gcc/
            * ChangeLog.meissner: Update.

Diff:
---
 gcc/ChangeLog.meissner | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gcc/ChangeLog.meissner b/gcc/ChangeLog.meissner
index b2563c965b6..952611992c1 100644
--- a/gcc/ChangeLog.meissner
+++ b/gcc/ChangeLog.meissner
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ==================== rebase 2022/06/16
+=======
+==================== merge 2022-06-13
+>>>>>>> ebc4e92b5f3 (Update ChangeLog.meissner.)
 
 ==================== patch work091/work001


             reply	other threads:[~2022-06-16 21:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-16 21:44 Michael Meissner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-16 21:44 Michael Meissner
2022-06-13 17:06 Michael Meissner
2022-06-13 17:03 Michael Meissner
2022-06-09 23:26 Michael Meissner

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=20220616214452.0CEF5383F95C@sourceware.org \
    --to=meissner@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).