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: Mon, 11 Nov 2019 09:40:07 +0300 Message-ID: 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> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="131287"; 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, emacs-devel@gnu.org To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 11 07:40:31 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 1iU3NH-000Y1C-Ax for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 07:40:31 +0100 Original-Received: from localhost ([::1]:49414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU3NF-0003ca-Fj for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 01:40:29 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47547) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <321942@gmail.com>) id 1iU3N3-0003cF-DA for emacs-devel@gnu.org; Mon, 11 Nov 2019 01:40:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <321942@gmail.com>) id 1iU3N1-00048B-MP for emacs-devel@gnu.org; Mon, 11 Nov 2019 01:40:17 -0500 Original-Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:38813) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <321942@gmail.com>) id 1iU3N1-00044S-D8; Mon, 11 Nov 2019 01:40:15 -0500 Original-Received: by mail-wm1-x331.google.com with SMTP id z19so11989984wmk.3; Sun, 10 Nov 2019 22:40:12 -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=1CwNHxTRufVAOCsRNeF9w6V0Lizc3GNqxg7LMag7JXo=; b=B3X8YkzIQoSjoQzio7l3L9Ac8vg0E/Z24oMcJESdt564B7afv2j0dsdybBSqqn4HF1 Eji/5XNBu1Y9BhGw8OdvIRGQVnsBWWPNZl1Cw317MgSr9Os/dj7wyWEcEPg8u4UWONKc IT9xjUE7kW21Wth7ekxlH3EqJLj7X1hyRNQenvIY6X9pBs9G2urd24VZSOJ67rYq8tCA qY7j7A/nA3OcERerOz1ikTmDxheWV1J4cCQAs0Oa/3y41VxUUXXU706bF+tkYEMsargT tBWyLKoit6mooSOYKyBVWg89I3ti8itf29eHf69l+5pduHPeyeNRwL2QSei2Hh+uWdyV iu/A== 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=1CwNHxTRufVAOCsRNeF9w6V0Lizc3GNqxg7LMag7JXo=; b=L5efSe/H3pA75rw8Th4FfBQJTR+EWLVH9Dzn0G3IidDQlE8OL8en9IBRZ2Vu5FDITF JsDv8guLeymqwRFHFgZKL2NiNN5Q2rRM8W9/EiMQysHoEGMxuCsF4QQPH2WODL9Qjj9Y coBDgNbSb3E2LDHD5jLEExUrY7UZ5QNC2SwU4VDdJuvETf502BMrP8CqroGWL0QCiz7k lMb7Jfc1VqDGVMETfdDQhZpLhEsh65pEYj8lBBht5uzz/EcF+yVLcS0L6LKLQjBxgV+K Th2kjyzbn7ub8xtQJxg+c45Sszb0nJfhZ6IkIT3bN5CAOjb14s/szW6YtAlwffKWp2i5 ezXw== X-Gm-Message-State: APjAAAUNIomHSCeOclyM6O+Fhg9opJ5ZtnepZBKtkFcJnPNHc0bc15eg DtjjEZIYCdkib6HO2d6NDgepby3O X-Google-Smtp-Source: APXvYqzntouSEL8dW4EhkwspDoe0js29BZNVxipPRediluOBjAsa2FqsO6npofAs+E/geavluwJv7A== X-Received: by 2002:a1c:b404:: with SMTP id d4mr20291316wmf.9.1573454411085; Sun, 10 Nov 2019 22:40:11 -0800 (PST) Original-Received: from localhost ([217.23.3.96]) by smtp.gmail.com with ESMTPSA id q25sm17859546wra.3.2019.11.10.22.40.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Nov 2019 22:40:10 -0800 (PST) In-Reply-To: (Richard Stallman's message of "Sun, 10 Nov 2019 22:03:53 -0500") 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::331 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:242079 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Richard Stallman wrote: > > Maybe, it was ediff-mode? > > What does Ediff mode do? Does it make three windows side by side? When Emacs is running on TTY: yes, it does. (While on graphical display = =E2=80=94 two windows side by side and one more in a new frame.) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFFBAEBCAAvFiEE1yoTx9fONarixgNIydoJ3hnBsjAFAl3JAkcRHDMyMTk0MkBn bWFpbC5jb20ACgkQydoJ3hnBsjCjqgf/WCzM3hsnwvrzNsPhLdwsQGqgEM5E3X+s FfBw6VST+14A5GXT7BaLLYMjWLxIkT4awXJn3zEYZDca2olcsU4CDS+LZsPs/0Ll RFnjmOUBVZ8qbmqwJ7jTFNbh+HMtXQAZrw3JouI5lRZRPLwsb+THQ59G2LNvNVyl 5SATxoCTDWR72sTo5glv/2W7/WwAaWg6h4DID8KM72bFtQsRmjeSYoP4zL6EgONT ySvhyyEXQtOf7O+tMC0dRLmZpFI++M3zM+Za9PdiWQ4Op0kNinL+QTb0VOeV2t6x 1vO7yaz0Fopib9AZXCs2lICo9OUEqEX8ckHYjHwqNL9Yd+bkKey9hA== =bgV3 -----END PGP SIGNATURE----- --=-=-=--