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: Thu, 28 Nov 2013 13:31:30 -0500 Message-ID: References: <87zjowpn2s.fsf@fencepost.gnu.org> <87a9gvnreg.fsf@fencepost.gnu.org> <8761ref7hy.fsf@fencepost.gnu.org> <87r4a1d6pt.fsf@fencepost.gnu.org> <87iovc29wk.fsf@zigzag.favinet> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1385663511 19800 80.91.229.3 (28 Nov 2013 18:31:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Nov 2013 18:31:51 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 28 19:31:56 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 1Vm6NW-0008TI-Bz for ged-emacs-devel@m.gmane.org; Thu, 28 Nov 2013 19:31:54 +0100 Original-Received: from localhost ([::1]:43527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm6NV-0007Oi-Vd for ged-emacs-devel@m.gmane.org; Thu, 28 Nov 2013 13:31:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm6NH-0007CT-6z for emacs-devel@gnu.org; Thu, 28 Nov 2013 13:31:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vm6N9-0000lk-Nn for emacs-devel@gnu.org; Thu, 28 Nov 2013 13:31:39 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:3316) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm6N9-0000ld-Jj for emacs-devel@gnu.org; Thu, 28 Nov 2013 13:31:31 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFHO+KEh/2dsb2JhbABEvw4Xc4IeAQEEAVYoCws0EhQYDYhCBsEtjWGDKQOIYZwZgV6DFQ X-IPAS-Result: Av4EABK/CFHO+KEh/2dsb2JhbABEvw4Xc4IeAQEEAVYoCws0EhQYDYhCBsEtjWGDKQOIYZwZgV6DFQ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="40621670" 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; 28 Nov 2013 13:31:30 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id AC8D3604BC; Thu, 28 Nov 2013 13:31:30 -0500 (EST) In-Reply-To: <87iovc29wk.fsf@zigzag.favinet> (Thien-Thi Nguyen's message of "Thu, 28 Nov 2013 09:44:11 +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:165841 Archived-At: > You can also think of A/B/Common, in which case C is fine. > That's what i do. That migth work. The down side is that visually they are presented as A/Common/B, which makes the lettering less intuitive. We could go for A/Base/C, but then for the 2-way situation (which, BTW, I despise) we'd have A/C which will probably feel odd to the user, or use A/B but then the "B" doesn't really corresponds to the "B" of the 3-way case. Stefan