From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful Date: Wed, 27 Nov 2013 15:46:59 -0500 Message-ID: References: <87zjowpn2s.fsf@fencepost.gnu.org> <87a9gvnreg.fsf@fencepost.gnu.org> <8761ref7hy.fsf@fencepost.gnu.org> <87r4a1d6pt.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1385585244 19114 80.91.229.3 (27 Nov 2013 20:47:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Nov 2013 20:47:24 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 27 21:47:29 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Vlm19-00052X-D6 for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2013 21:47:27 +0100 Original-Received: from localhost ([::1]:37732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlm19-0003ro-2T for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2013 15:47:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlm0y-0003qj-WC for emacs-devel@gnu.org; Wed, 27 Nov 2013 15:47:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vlm0r-0005k4-N9 for emacs-devel@gnu.org; Wed, 27 Nov 2013 15:47:16 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:53504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlm0j-0005iS-8G; Wed, 27 Nov 2013 15:47:01 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFHO+KEh/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBsEtkQoDiGGcGYFegxU X-IPAS-Result: Av4EABK/CFHO+KEh/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJIgeBsEtkQoDiGGcGYFegxU X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="40546853" Original-Received: from 206-248-161-33.dsl.teksavvy.com (HELO pastel.home) ([206.248.161.33]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 27 Nov 2013 15:46:59 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id B786360054; Wed, 27 Nov 2013 15:46:59 -0500 (EST) In-Reply-To: <87r4a1d6pt.fsf@fencepost.gnu.org> (David Kastrup's message of "Wed, 27 Nov 2013 19:45:18 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:165814 Archived-At: > Whenever you use _meaning_-carrying names, they'll be wrong half of the > time. Ediff got that right with A, B, and, uh, C? No idea (rarely use > three-way conflicts). It's arbitrary what the first and the second > _mean_, so you just put them first and second on screen and give them A > and B as monikers. For three-way merges, the 3rd is called "BASE" in smerge, which makes sense, no matter how you get that result. Using A/B/Base is not great because of the conflicting first letter of B and Base. Maybe we could go with X/Y/Base? > I don't actually care all that much whether you want to make smerge-mode > an intellectual challenge, Now that was a constructive side remark, Stefan