Re: [patch,commit] Remove ">>>>>> .r..." from a ChangeLog

2019-10-08 Thread Florian Weimer
* Tobias Burnus: > Both my mailer and > https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00528.html show an empty > line before the "" – as does the file itself. > > Thus, there is already one – which should be enough. Inline patches with Content-Type: text/plain; charset="utf-8"; format=flowed

Re: [patch,commit] Remove ">>>>>> .r..." from a ChangeLog

2019-10-08 Thread Jakub Jelinek
On Tue, Oct 08, 2019 at 01:52:17PM +0200, Tobias Burnus wrote: > Both my mailer and https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00528.html > show an empty line before the "" – as does the file itself. > > Thus, there is already one – which should be enough. Guess some issue in the mutt view

Re: [patch,commit] Remove ">>>>>> .r..." from a ChangeLog

2019-10-08 Thread Tobias Burnus
Both my mailer and https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00528.html show an empty line before the "" – as does the file itself. Thus, there is already one – which should be enough. Cheers, Tobias, who also thinks that email clients could be better in terms of line breaks and spa

Re: [patch,commit] Remove ">>>>>> .r..." from a ChangeLog

2019-10-08 Thread Jakub Jelinek
On Tue, Oct 08, 2019 at 12:46:13PM +0200, Tobias Burnus wrote: > commit 4958da0be3f08d5f715dc4b74a8e93db18ca1a9e > Author: burnus > Date: Tue Oct 8 09:35:56 2019 + > > Remove '>>>' merge marker from changelog > git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276689 > 138bc75d-0d04-