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: Sun, 10 Nov 2019 22:03:53 -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="54587"; 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 Mon Nov 11 04:04:40 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 1iU00N-000E2h-Ap for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 04:04:39 +0100 Original-Received: from localhost ([::1]:48714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU00L-0005Ex-Hb for ged-emacs-devel@m.gmane.org; Sun, 10 Nov 2019 22:04:37 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57723) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTzzl-00056U-RA for emacs-devel@gnu.org; Sun, 10 Nov 2019 22:04:02 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:36208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iTzzl-0006lx-MW; Sun, 10 Nov 2019 22:04:01 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1iTzzd-00071w-Np; Sun, 10 Nov 2019 22:03:53 -0500 In-Reply-To: <7e48izb8.321942@gmail.com> (message from Dmitry Alexandrov on Sat, 09 Nov 2019 23:12:43 +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:242077 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. ]]] Talking about my problems using git via Emacs and VC. When I tried this, a few years ago, something gave me three side-by-side windows and I had no idea what to do with them, so I had to bail out. > Maybe, it was ediff-mode? What does Ediff mode do? Does it make three windows side by side? I looked at the doc strings of ediff-mode and ediff. They give a few secondary details but they don't even start to answer the questions, "What is this good for? What does it do?" So I can't tell whether it would make three windows. Regardless of my git issues, those doc strings ought to be improved. Would someone like to do it? -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)