From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Making git as easy as CVS, for handling merge conflicts Date: Mon, 11 Nov 2019 04:37:37 +0100 Message-ID: <878sonhym6.fsf@telefonica.net> 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: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="193273"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Dmitry Alexandrov <321942@gmail.com>, 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 04:37:55 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 1iU0WX-000oAt-NC for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2019 04:37:53 +0100 Original-Received: from localhost ([::1]:48878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU0WW-0005Pi-CG for ged-emacs-devel@m.gmane.org; Sun, 10 Nov 2019 22:37:52 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33567) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU0WP-0005PW-Tr for emacs-devel@gnu.org; Sun, 10 Nov 2019 22:37:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iU0WO-0004Qz-Ox for emacs-devel@gnu.org; Sun, 10 Nov 2019 22:37:45 -0500 Original-Received: from relayout03.e.movistar.es ([86.109.101.203]:34195 helo=relayout03-redir.e.movistar.es) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iU0WN-0004Py-Ay; Sun, 10 Nov 2019 22:37:43 -0500 Original-Received: from sky (233.red-79-151-7.dynamicip.rima-tde.net [79.151.7.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: 981711563@telefonica.net) by relayout03.e.movistar.es (Postfix) with ESMTPSA id 47BGm25nPRzMktX; Mon, 11 Nov 2019 04:37:38 +0100 (CET) In-Reply-To: (Richard Stallman's message of "Sun, 10 Nov 2019 22:03:53 -0500") X-CTCH-Score: 0.000 X-CTCH-ScoreCust: 0.000 X-TnetOut-Country: IP: 79.151.7.233 | Country: ES X-TnetOut-Information: AntiSPAM and AntiVIRUS on relayout03 X-TnetOut-MsgID: 47BGm25nPRzMktX.A5CCB X-TnetOut-SpamCheck: no es spam, Unknown X-TnetOut-From: ofv@wanadoo.es X-TnetOut-Watermark: 1574048259.25346@REFY7EtHUEqtSYSVzbJP0w X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.109.101.203 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:242078 Archived-At: Richard Stallman writes: > 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. The Ediff manual (listed on C-h i) gives a nice explanation of what Ediff does on its Introduction node. > 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.