From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Richard Copley Newsgroups: gmane.emacs.devel Subject: Re: Regarding smerge upper/lower; needs NEWS Date: Fri, 7 Apr 2017 19:06:26 +0100 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1491588431 23487 195.159.176.226 (7 Apr 2017 18:07:11 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Apr 2017 18:07:11 +0000 (UTC) Cc: Emacs developers , Kaushal Modi To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 07 20:07:07 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 1cwYHl-0004yb-HD for ged-emacs-devel@m.gmane.org; Fri, 07 Apr 2017 20:07:01 +0200 Original-Received: from localhost ([::1]:52111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwYHr-0002Rg-9O for ged-emacs-devel@m.gmane.org; Fri, 07 Apr 2017 14:07:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwYHj-0002Qr-Vk for emacs-devel@gnu.org; Fri, 07 Apr 2017 14:07:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwYHi-0004IR-RY for emacs-devel@gnu.org; Fri, 07 Apr 2017 14:06:59 -0400 Original-Received: from mail-vk0-x22b.google.com ([2607:f8b0:400c:c05::22b]:34051) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cwYHh-0004IB-HQ; Fri, 07 Apr 2017 14:06:57 -0400 Original-Received: by mail-vk0-x22b.google.com with SMTP id z204so83968572vkd.1; Fri, 07 Apr 2017 11:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=YEhVMgTgf2CTyPw1dDDGQcP3JxBOXquiDyTM20VjxUk=; b=BkuBtTZKGZPXAimtEk4IvtRG3G1omhauHRkXclcmOVcRMeh1R1gNthLM8JsArAOSzS 7WoNIrS7MQZuHTObOtSvjslelTKf1UI5rWePzkXurbhJPE5V/PHG0MhdIIhz5v7zZdHr igpAW9sO8q/nULxU6ZDBq9CQXwT5Onh+sOHnck+Zu9+CU9uOoOTgZu5SK3yTprUcfFD3 1Iojabae5laCcxTDBNzsz7m38viuG6vmkoxE1wwkb0Mlnq8YydXO6ZYbxGPqoXf+ZLLu 3dyWxlgzizkLL1ak5Py3uRoMv86u06gdS6uxALJa1OchJE6j/NA0W6aoP/N6oUJQUbob uZ8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=YEhVMgTgf2CTyPw1dDDGQcP3JxBOXquiDyTM20VjxUk=; b=c6CXKTUafHYkLCXDUKlezm8t71UzyhhlVeuo8Gn26WRfeU0X41Cu+5ficFj5zI18gz q4ZjRuoAliSjFgmTXMDHAGxxkj/iAq/8LtnDxuTll0I0tKpw3N391t2ZkR6GtN/Elrtf npby9Q8UbCR97rNi28BRMXNLWygjtV2/9CRH2kGdYmcdZ7FHxp/EQE+hDbAEp1BgRzTs /JCFL4kOzj5f+GDhRuQ+IwFGaPOeHUD9quDG8omHmx5XiNgTpaDt5URjMxMMl+QoXDkc m5eg48V4R3kDXD5eaN4ODwZO+aI4FGiODfsm6X30sYkBnAeCrwyqFCb1w2Wh8xpgem// EGmQ== X-Gm-Message-State: AFeK/H1/pRnQugxJi6VuPsDXbjjd0k3JqBfPqmjXPIuQSsAaofL7cKTgsLdyIT44oeGQfvZeEMq03tyUBuQXvQ== X-Received: by 10.159.48.221 with SMTP id k29mr21316063uab.6.1491588416757; Fri, 07 Apr 2017 11:06:56 -0700 (PDT) Original-Received: by 10.176.71.131 with HTTP; Fri, 7 Apr 2017 11:06:26 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400c:c05::22b 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:213768 Archived-At: On 24 March 2017 at 19:46, Glenn Morris wrote: > Kaushal Modi wrote: > >> http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=bdfee01a6567b9f08f82bc84d1196e6cb62587ca > [...] >> Though, I was surprised to see that this change was not mentioned in NEWS >> in the master branch. >> >> Can you please add that? > > I don't find it (renaming with aliases to the old names) NEWSworthy, > but if you want to add an entry, it's totally fine by me. I've had plenty of time to think about this and I still don't get it. Why are we calling the left window UPPER and the right window LOWER? In the lower pane (the conflicted file for resolution) they are called "variant A" and "variant B". Shouldn't we call them that too, so that we know which one is which?