From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.emacs.devel Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful Date: Thu, 28 Nov 2013 09:44:11 +0100 Message-ID: <87iovc29wk.fsf@zigzag.favinet> 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: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1385628357 28402 80.91.229.3 (28 Nov 2013 08:45:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Nov 2013 08:45:57 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 28 09:46:02 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 1VlxEX-0004JL-EJ for ged-emacs-devel@m.gmane.org; Thu, 28 Nov 2013 09:46:01 +0100 Original-Received: from localhost ([::1]:39824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlxEX-0002ZG-2c for ged-emacs-devel@m.gmane.org; Thu, 28 Nov 2013 03:46:01 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlx9U-0001qQ-J4 for emacs-devel@gnu.org; Thu, 28 Nov 2013 03:40:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vlx9O-0001P2-TO for emacs-devel@gnu.org; Thu, 28 Nov 2013 03:40:48 -0500 Original-Received: from smtp206.alice.it ([82.57.200.102]:22094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlx9O-0001Ol-6i for emacs-devel@gnu.org; Thu, 28 Nov 2013 03:40:42 -0500 Original-Received: from zigzag.favinet (95.233.75.217) by smtp206.alice.it (8.6.060.28) id 52443B2D12423089 for emacs-devel@gnu.org; Thu, 28 Nov 2013 09:40:40 +0100 Original-Received: from ttn by zigzag.favinet with local (Exim 4.80) (envelope-from ) id 1VlxCu-0003sh-Jh for emacs-devel@gnu.org; Thu, 28 Nov 2013 09:44:20 +0100 Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: (Stefan Monnier's message of "Wed, 27 Nov 2013 15:46:59 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 82.57.200.102 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:165830 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable () Stefan Monnier () Wed, 27 Nov 2013 15:46:59 -0500 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? You can also think of A/B/Common, in which case C is fine. That's what i do. =2D-=20 Thien-Thi Nguyen GPG key: 4C807502 (if you're human and you know it) read my lisp: (responsep (questions 'technical) (not (via 'mailing-list))) =3D> nil --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlKXAl4ACgkQZwMiJEyAdQLTlQCghRdXG4XTG+pjFxAhydFG+pOY +aEAnR5+JLxVrNMlHaZhK6dj4Vs1JWXN =Btcu -----END PGP SIGNATURE----- --=-=-=--