From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Alexandrov <321942@gmail.com> Newsgroups: gmane.emacs.devel Subject: Re: Making git as easy as CVS, for handling merge conflicts Date: Sat, 16 Nov 2019 11:29:50 +0300 Message-ID: <8sogrzpd.321942@gmail.com> References: <20191101145220.qowvzqnkolnwp5kr@gmail.com> <4ac15ac98a94eec8ed58c505d70c4f77cd5114fb.camel@gnu.org> <20191104124109.wv5f5xstpds4giuk@gmail.com> <83mud7g5cd.fsf@gnu.org> <83eeyje7qw.fsf@gnu.org> <83h83da232.fsf@gnu.org> <83mud499w7.fsf@gnu.org> <7e48izb8.321942@gmail.com> <7d55d23a-8acc-4721-bb91-83f900570057@gmx.at> <7e46cldx.321942@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="195153"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: eliz@gnu.org, Richard Stallman , emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 16 09:30:37 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iVtTX-000ocO-VD for ged-emacs-devel@m.gmane.org; Sat, 16 Nov 2019 09:30:36 +0100 Original-Received: from localhost ([::1]:46856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVtTW-0000Be-7I for ged-emacs-devel@m.gmane.org; Sat, 16 Nov 2019 03:30:34 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55829) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <321942@gmail.com>) id 1iVtSv-0000BD-7E for emacs-devel@gnu.org; Sat, 16 Nov 2019 03:29:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <321942@gmail.com>) id 1iVtSu-0006eU-6G for emacs-devel@gnu.org; Sat, 16 Nov 2019 03:29:57 -0500 Original-Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:56187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <321942@gmail.com>) id 1iVtSt-0006Tw-U1; Sat, 16 Nov 2019 03:29:56 -0500 Original-Received: by mail-wm1-x32d.google.com with SMTP id b11so11909132wmb.5; Sat, 16 Nov 2019 00:29:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:user-agent:accept :accept-language:mail-copies-to:date:message-id:mime-version; bh=QRcCSfB1wW5flUiLfW3zNhoRuc1E7LkAknKzsPX6M50=; b=j23vjI6Cvzcmr+X+fzZGZXyAihwlIEpe+4LZ7k6O3YB6XJusx4M0YthZReJDVW4rZJ hY7TTJroeOvMxQ5IcPD4b4qZOeQq2lighlgpa1OX+vBBYGs7hKouQIMfYUwoybiD/ntX 2Clrz7crAa3gkNW9xsRMsZ+H+7AaEQAyC6yzAH0J8t9Xy7S6TplQSUZWWzvPM7K9YS2L NHV/gVwb1iYa8teBonHRhPGUPHbUtIpVFv17dRMRGZiXx0Sf4qTRc8EmPS+pqOOj4xMz qZadHjm1CW7GevSrFZH+AYUuV+glyntzAIzpfVNF4jgvDvJy3EyaAlqA+4B0hxj4+7et IAuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references :user-agent:accept:accept-language:mail-copies-to:date:message-id :mime-version; bh=QRcCSfB1wW5flUiLfW3zNhoRuc1E7LkAknKzsPX6M50=; b=g1d4Po7+97Yil69hbxkUbHW5D0Dy6+q2eaySc/sldNNemgV4Kc3tnLiVTBKRfeAssB 9ujiP+f3WPWUwX69afsJlDlBNOsMD5Pl6Up23Gz+O0BNJ51XJcPNHC3EGNamfB+QqyJb Qwlq39/bdZbezAbesx0RajauweozQZwnK8UDFTp2J1Fk8S2MtJfHkzNZtwMwNcfkwGpp wfvJbPzMYHhq2qwhItGjYDhme0gK/l+sRrW5+fZzuQH5UUKtsuvex2vgpiZ89uYYV7Yl F0Yb9KsQBn+U36JfbMEiAPjqgDU2ZPVIzbV6Lnn7Q9fc/TiA8PECNK0Yjn9mhhebl4A2 L//Q== X-Gm-Message-State: APjAAAUSRNIpVmD6JLi2sTJYEDtrpeiox5zfEO4QvLHvECvtNBys7eyA 1fLPnR42FwErpLluEZmTVoheXpL+ X-Google-Smtp-Source: APXvYqwaAjLNkc2xoiA9W+iTz1slGJP7mJ/iWLQNJHcyIgqNZgRCKJykRBh8dBweE//18Z3K8963gg== X-Received: by 2002:a1c:7d95:: with SMTP id y143mr20056983wmc.143.1573892994470; Sat, 16 Nov 2019 00:29:54 -0800 (PST) Original-Received: from localhost ([217.23.3.96]) by smtp.gmail.com with ESMTPSA id t133sm17798091wmb.1.2019.11.16.00.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Nov 2019 00:29:53 -0800 (PST) In-Reply-To: (martin rudalics's message of "Tue, 12 Nov 2019 09:10:43 +0100") Accept: text/plain,text/markdown,text/x-org,text/html,text/*,*/* Accept-Language: ru,en Mail-Copies-To: always X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:242253 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable martin rudalics wrote: >> * ediff-setup-windows-plain-merge(# # #= #) > > But 'ediff-setup-windows-plain-merge' here shows only buf-A and buf-B sid= e by side. It shows buf-C below these two and control-buffer at the bottom= of the frame. Ah, yes. When I said =E2=80=98side by side=E2=80=99, I had not meant =E2= =80=98split vertically=E2=80=99, just =E2=80=98next to each other=E2=80=99,= in this case: in the same frame. Sorry for confusion. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFFBAEBCgAvFiEE1yoTx9fONarixgNIydoJ3hnBsjAFAl3Ps34RHDMyMTk0MkBn bWFpbC5jb20ACgkQydoJ3hnBsjAexAf/SI/EuyiqgNCAMt7sPF82q5iJBxQH7Lbp yTvX3nBRsuWRWBKqgBzQUTudUc9LzN1KcGU7IEZpBMNikYF/JaIAO9BP0f3eJtAy 1qXHQUXP9YTERP5xfm5nCWjUXxeEkqksrNCdDzY3OcB7qh/usVR2eN2mQ8wQE2cM 5dFDEkIP6LABvu/KXDiGdlsCRQ3HySz55EZ2DeB7Mp2khRwUqeJHzwSFlYIYlyi6 5Lx6uLdwGnEK7UTuFQnbYE6JN9Sia50r8WEq3YCxOi6QSpFb7q25v1AdckKFW/pX Tyt3O0NvIyXG/Xmd6gjEFvK8GEUkL/p1AOLOHyjF6pb6juUqWR3+Pg== =DC2F -----END PGP SIGNATURE----- --=-=-=--