From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stephan Mueller Newsgroups: gmane.emacs.devel Subject: RE: Regarding smerge upper/lower; needs NEWS Date: Thu, 13 Apr 2017 19:34:30 +0000 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1492112146 8133 195.159.176.226 (13 Apr 2017 19:35:46 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 13 Apr 2017 19:35:46 +0000 (UTC) To: "emacs-devel@gnu.org" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 13 21:35:40 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cykWq-0001uZ-D2 for ged-emacs-devel@m.gmane.org; Thu, 13 Apr 2017 21:35:40 +0200 Original-Received: from localhost ([::1]:50624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cykWr-0006wW-9W for ged-emacs-devel@m.gmane.org; Thu, 13 Apr 2017 15:35:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cykW9-0006wR-5f for emacs-devel@gnu.org; Thu, 13 Apr 2017 15:34:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cykW5-0008EM-2b for emacs-devel@gnu.org; Thu, 13 Apr 2017 15:34:57 -0400 Original-Received: from mail-sn1nam01on0114.outbound.protection.outlook.com ([104.47.32.114]:37285 helo=NAM01-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cykW4-0008Cz-GL for emacs-devel@gnu.org; Thu, 13 Apr 2017 15:34:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=vgOpnWQOSkyOqzqS244gjXZu4QK2PSSBac/YHPPtbus=; b=QzlVYCNDhbDKp8EzrejQCRxco85qzMhOBJAQcIgigquCg+lzN/R8GMsiLEEsYIXB+5ezWpP21OjS1FXZ8aZonHAa93E2keVus3j4Nqus7psqpnmUSYcM5+1R0jD1oBPRqHbjxmzKg5UX5oFqD5RUfXU8AZBcie9xC9JipqlAQlo= Original-Received: from CY1PR03MB2251.namprd03.prod.outlook.com (10.166.207.15) by CY1PR03MB2251.namprd03.prod.outlook.com (10.166.207.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Thu, 13 Apr 2017 19:34:49 +0000 Original-Received: from CY1PR03MB2251.namprd03.prod.outlook.com ([10.166.207.15]) by CY1PR03MB2251.namprd03.prod.outlook.com ([10.166.207.15]) with mapi id 15.01.1019.025; Thu, 13 Apr 2017 19:34:49 +0000 Thread-Topic: Regarding smerge upper/lower; needs NEWS Thread-Index: AQHSs+/nLHKSM0qvI0ayKKk9Kntjr6HDoPhEgAAEi5CAAAt8cA== Importance: low X-Priority: 5 Deferred-Delivery: Thu, 13 Apr 2017 19:34:00 +0000 In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: gnu.org; dkim=none (message not signed) header.d=none; gnu.org; dmarc=none action=none header.from=microsoft.com; x-originating-ip: [2001:4898:80e8:f::28] x-microsoft-exchange-diagnostics: 1; CY1PR03MB2251; 7:16ZXTKPk0J3hxJKPZRLakCgoo322JhPgFYXx+fgcUe4S/+ZUI67BbBdGJtR/7ZSZ8fJ81hFPapxHVcT36R+kByIh9St4GIXv45yrzRjfWOuynCx1UtW4YXIHsrQZF1uKh2zsr0cHqvd6KLaewMhQO4MYRRIAv3VRipuwXEnga8kGWCoe9P1ZRrWuF2FUgbSgL5hm1TltJ4DDe//QVpZrRzcblczHyV0Tup7dJ9JSvsIeg/0K3tChbNQalDq3J2rKSnoE6F0OWTXS8z+J/J77O5unDATAqrs4JVYLUJpIdpAyL06oZ+2ZnE4SfcXIUds7LLA/PIJZ2AIZJGyUaX7oMqpeYPTVhr0GnxE7DvjY43o= x-ms-office365-filtering-correlation-id: c4df420d-b552-47ff-8924-08d482a4268d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR03MB2251; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(22074186197030); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148); SRVR:CY1PR03MB2251; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB2251; x-forefront-prvs: 02760F0D1C x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6009001)(39400400002)(39850400002)(39840400002)(39860400002)(39410400002)(39450400003)(377454003)(13464003)(24454002)(25786009)(53546009)(6116002)(54356999)(77096006)(33656002)(102836003)(7696004)(81686999)(6506006)(86612001)(76176999)(53936002)(10090500001)(122556002)(8990500004)(93886004)(9686003)(2900100001)(6246003)(38730400002)(2906002)(8936002)(81166006)(110136004)(3280700002)(5640700003)(86362001)(99286003)(3660700001)(55016002)(8676002)(6436002)(305945005)(2501003)(2351001)(5660300001)(50986999)(74316002)(7736002)(10290500002)(189998001)(6916009)(2950100002)(6666003)(229853002)(5005710100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB2251; H:CY1PR03MB2251.namprd03.prod.outlook.com; FPR:; SPF:None; MLV:sfv; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Apr 2017 19:34:49.6837 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2251 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.114 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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:213948 Archived-At: Ack, I write gibberish for no good reason. Please ignore me. Sorry for th= e noise. stephan(); -----Original Message----- From: Stephan Mueller=20 Sent: Thursday, April 13, 2017 11:56 AM To: emacs-devel@gnu.org Subject: RE: Regarding smerge upper/lower; needs NEWS Stefan wrote: " Let's not forget that smerge works not only for 2-part conflicts but " also for 3-part conflicts (which I think are immensely more valuable), Agreed on the higher value of handling 3-part conflicts. " Currently, the names are " "upper/base/lower", which I find tolerable, but I'm not sure "a/base/b" " is good enough. I'm not sure the name 'upper' adds anything if it's displayed in the upper pane, which suggests to me that 'a' is no worse. (And if 'upper' is displ= ayed anywhere else, it's causing confusion. stephan();