This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch,commit] Remove ">>>>>> .r..." from a ChangeLog
- From: Tobias Burnus <tobias at codesourcery dot com>
- To: gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Tue, 8 Oct 2019 12:46:13 +0200
- Subject: [patch,commit] Remove ">>>>>> .r..." from a ChangeLog
- Ironport-sdr: 9OF+6EsQKLiKMM/MRcMArHx2CbnZ6D9FeMDbAGAscFscdGIBowGmB4zM/UHEZwnZxCEckw6TDZ LI+lGDpcmT6utbQ04LBfxY+zTH24NrZhNQftOOHpIGQrURhi+bOXI4MWZZuqt3SDjf4x9udAU9 k+1xhxhOYqiaoQLW4Ctd8jr7GbCas7e18Sody+O+a4oBuh8iRjtHVljh7BadZRshuYpiixhPK7 JFR3NksJd5i9E5tBLv15vgV6VvbWhvZjBThDPpdcnXrPPU0M2A5VGYCQKbw8S1+sjmyTQfg1wi cMA=
- Ironport-sdr: FAFRyQv0MBDHzW/ywk0HlALPXwv+lsDYNl/JybSnnmrG7GWr5xB7N/nz/6k8bj2I82VRFU6tfP eynQ3vTCmzsUX8tCfcGd+5oqoEaj/ZYvLAMhVA8dEvKNJdCNvFZELpIRhUSDk3qVsGLhTe0Aj/ sZASc/nO+ud72E1bvDXgLyheEeKpZZU0RQwwNwY7S9LvW48b3yAx4wuZOJ7YC7ypgQoccBJ/sh WNbVQFbQErTqG2y0l5PZqzZvECWAwjBPcBD+axHLj/Pq8Zit5UZSifoqZ8BdulLaShYsON+kKu RSQ=
commit 4958da0be3f08d5f715dc4b74a8e93db18ca1a9e
Author: burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue Oct 8 09:35:56 2019 +0000
Remove '>>>' merge marker from changelog
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276689 138bc75d-0d04-0410-961f-82ee72b054a4
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 84ee818a49d..6e98130dd96 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -153,7 +153,6 @@
(lang_decl): Add new optional_arg field.
(GFC_DECL_OPTIONAL_ARGUMENT): New macro.
->>>>>>> .r276463
2019-10-01 David Malcolm <dmalcolm@redhat.com>
* error.c (gfc_diagnostic_starter): Clear the prefix before