From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Making git as easy as CVS, for handling merge conflicts Date: Mon, 11 Nov 2019 22:17:56 -0500 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> Reply-To: rms@gnu.org Content-Type: text/plain; charset=Utf-8 Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="244514"; mail-complaints-to="usenet@blaine.gmane.org" Cc: eliz@gnu.org, emacs-devel@gnu.org To: Dmitry Alexandrov <321942@gmail.com> Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 12 04:18:05 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 1iUMgv-0011Sr-H5 for ged-emacs-devel@m.gmane.org; Tue, 12 Nov 2019 04:18:05 +0100 Original-Received: from localhost ([::1]:58832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUMgu-0006F0-6T for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 22:18:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42247) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUMgn-0006Eq-R4 for emacs-devel@gnu.org; Mon, 11 Nov 2019 22:17:58 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iUMgn-0006YE-N9; Mon, 11 Nov 2019 22:17:57 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1iUMgm-0006B8-II; Mon, 11 Nov 2019 22:17:56 -0500 In-Reply-To: (message from Dmitry Alexandrov on Mon, 11 Nov 2019 09:40:07 +0300) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:242100 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > 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 — two windows side by side and one more in a new frame.) So, how and where does vc invoke this, and is there a way to turn that off? -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)