From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: * X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=1.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,LIST_MIRROR_RECEIVED,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id D4D0C1F852 for ; Fri, 4 Feb 2022 23:12:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238789AbiBDXMr (ORCPT ); Fri, 4 Feb 2022 18:12:47 -0500 Received: from mout.gmx.net ([212.227.17.22]:33137 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234597AbiBDXMq (ORCPT ); Fri, 4 Feb 2022 18:12:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644016361; bh=+1mhkcWDgUfpO41aBR8SvH3dfmb7BXGgiDF1s64vRPI=; h=X-UI-Sender-Class:Date:From:To:cc:Subject:In-Reply-To:References; b=eNdzlAYcBUSaMG4aefma6gpptuVALl0IsuGkeov0XH1GEOzYY23k+4yLR+8sRz7w5 wPz7oQcjZDRqmtxRR7LSmdaSjZHZ3VBxSRuOUaJT2uErEIOMwqafxP0MV8l6EnTJ2F UjUPSF1PquyNHeJsK/r6aug+IUg+2nGiFqTcrFyM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [172.27.196.48] ([89.1.215.8]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MIdeX-1n1VIS0txF-00EcCM; Sat, 05 Feb 2022 00:12:41 +0100 Date: Sat, 5 Feb 2022 00:12:39 +0100 (CET) From: Johannes Schindelin X-X-Sender: virtualbox@gitforwindows.org To: Elijah Newren cc: Elijah Newren via GitGitGadget , Git Mailing List , Christian Couder , Taylor Blau , Johannes Altmanninger , Ramsay Jones , Christian Couder , =?UTF-8?Q?Ren=C3=A9_Scharfe?= Subject: Re: [PATCH 09/12] merge-tree: provide a list of which files have conflicts In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K1:Cks4Ed+kZiGL+enagyqro3z2+SkNcXQ+OZ4KkzNaUMUApvWfRaB Xe0g8qHxSm5lQPUMeyr0pB3wUWUKjSLZXkzCJlU3c8Z5/SgHvvJKZmTGEorB1a84MTNIi9K jUurDiWnQjGmGayayhkZzYc+8Y0mM6vD0x2rDqJ5FU0YSgFTTswWVkhPoPJ76alYESno8Fz MbdzzS+AXEOBfyW2ny5wA== X-UI-Out-Filterresults: notjunk:1;V03:K0:yCSMGXgA1CU=:H7k8+NqMUd9uRtN9zKgC5S z0xkwRnv/8qm1vDBPrwxAVVUvoMEn0PKkVW0xTGi0rFP+nSzdfNEmsP4n9jbS/KZQqMbzMQHR jfWiDHTbKLQbMhQmxgWFpESlYzucLgRxIauPY8GwSO1Ab4xfut7WUR5fZBCMFdL7bCyHCWFR8 vUYw4xXTxvYokp4ufyK3TYjqmWxlFcCScU5YF7S5lDAfB6Od+m1AISn/o1wOUbY2C+DZTpXFh cc1OEjxtT4J15GAhx79KwY2WSrJ05I6xtcCZSys5Axyg0y92vhrB7uKqmDbBEy/YGW1Q2Pw4B mtFYa3FcUA4z984vH1+Di53t7FWY+aestd4AszZMLgxHeWzMkJxhjC91rgf+Lws8ayzREFI3T GUsHCMVbWnVzGhWFzr2VMiwvlL1LmkwAO+S6bPZFQ+8LKOii8b9NbSGm31MT8ubWdRvjc/cUN uh5GpvSTP8LU4EzFE/z32XUSbBZyO58hBg6fA8wNP5oL762uG+q2kLQeNSDMOjZF052zOECul sQfGApo7AmWbXXffsgWG8KRcQUK2YIpgHQkrrHl5u/ndpNu09+PmI2HgPrxSVTFwvPYt4BOuL 28jojoe9Lh8qAS9SrKNkXh3MkcgHIilcnfToSe3/Xm/5eJlekEsFJZOuau4oVuH9exTgE/1S1 13uKj5Evf/pf7aoSYhjVC74op9zK0ioL2gaPNPzfnPhkbmnWnlIvWDFwZp0iVAt+3/qEcKoZE fwJHHiW+J8sTDHbt7qjS7T0+1hQrVXsvIQGAKEDpsPF1CrWjtxhgutbZHhIGEJ/xlGMJp2/zH l+iHP6+ALzpmWw9WefpZsRv5zGW99WAof7SNHmvqx/j1e7UvcLHhtNWoiL/kK5StBZXojNfiI Z450rT4DddJt5ff8URtLbM7K76lr6dA6xA06iUqdNRtv1HWasxgN56KZOiEwNNO1VPHXP1Ako tc65kP3uHC3cwxoaT84FDXBirb/Uq5IoqJb97fPZUIMY1FIxiYC77mVTh2ZW+p2DXHusIhd3E 1pb/b2QbSl+NPc2XQrpubHz9rBdAEYMEL38MhC8gvNRSnuBZpFmCP4xTr76oOGjaVs/5Y0aNc oZfFzZTX6eYmkA= Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Elijah, On Fri, 28 Jan 2022, Elijah Newren wrote: > On Fri, Jan 28, 2022 at 8:57 AM Johannes Schindelin > wrote: > > > > Hi Elijah, > > > > On Sat, 22 Jan 2022, Elijah Newren via GitGitGadget wrote: > > > > > From: Elijah Newren > > > > [...] > > > diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-me= rge-tree.txt > > > index fd7a867de60..041a4ac2785 100644 > > > --- a/Documentation/git-merge-tree.txt > > > +++ b/Documentation/git-merge-tree.txt > > > @@ -58,6 +58,7 @@ simply one line: > > > Whereas for a conflicted merge, the output is by default of the for= m: > > > > > > > > > + > > > > > > > To distinguish between the list of conflicted files and the informatio= nal > > messages, I think it would be good to insert an empty line, as a > > separator, like. > > Yes, I agree; that's why I did so. :-) My concern was that I did not see this empty line reflected in the quoted diff. I would have expected an empty line between the `` and the `` line. Thanks, Dscho