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:18:10 -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> <878sonhym6.fsf@telefonica.net> 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="245700"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 321942@gmail.com, eliz@gnu.org, emacs-devel@gnu.org To: =?iso-8859-1?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 12 04:18:21 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 1iUMhB-0011jX-1i for ged-emacs-devel@m.gmane.org; Tue, 12 Nov 2019 04:18:21 +0100 Original-Received: from localhost ([::1]:58834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUMh9-0006U6-Qe for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 22:18:19 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42290) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUMh3-0006Ru-EA for emacs-devel@gnu.org; Mon, 11 Nov 2019 22:18:14 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iUMh2-0006mA-SC; Mon, 11 Nov 2019 22:18:12 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1iUMh0-0006Cg-Hu; Mon, 11 Nov 2019 22:18:10 -0500 In-Reply-To: <878sonhym6.fsf@telefonica.net> (message from =?iso-8859-1?Q?=C3=93scar?= Fuentes on Mon, 11 Nov 2019 04:37:37 +0100) 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:242101 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. ]]] > > 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? > Ediff has multiple entry points and explaining what Ediff does and its > basic concepts on each of those commands would be quite redundant, IMHO. With a little imagination, it is surely possible to solve the problem without much repetition. Would someone like to try? -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)