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 20:24:55 +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 1491593188 8784 195.159.176.226 (7 Apr 2017 19:26:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Apr 2017 19:26:28 +0000 (UTC) Cc: Glenn Morris , Kaushal Modi , Emacs developers To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 07 21:26:23 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 1cwZWZ-0001Ok-8E for ged-emacs-devel@m.gmane.org; Fri, 07 Apr 2017 21:26:23 +0200 Original-Received: from localhost ([::1]:52315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwZWb-0005ND-W8 for ged-emacs-devel@m.gmane.org; Fri, 07 Apr 2017 15:26:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwZVh-0005N3-99 for emacs-devel@gnu.org; Fri, 07 Apr 2017 15:25:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwZVg-0006S3-3z for emacs-devel@gnu.org; Fri, 07 Apr 2017 15:25:29 -0400 Original-Received: from mail-ua0-x22d.google.com ([2607:f8b0:400c:c08::22d]:36622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cwZVe-0006RV-LZ; Fri, 07 Apr 2017 15:25:26 -0400 Original-Received: by mail-ua0-x22d.google.com with SMTP id c28so483452uaf.3; Fri, 07 Apr 2017 12:25:26 -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=omrsQVq4dZzH0AlhjlQerOgwR99PJdEg2m87KVnOv+E=; b=ZdgknesUBMpeDW59HaVD0HgBcTJiUcI9F2k7uS3ET9K8DGrfVOV+KV5LNolRacI/b7 btCuHsOyDMQ00ufYqvamrj7JC0aggTZ4OrSMXIjT24pyQkbUb82rFBz130CAb0MoTiP7 RBtcA2evYAqMDQprXMIBbWq3lUIguKumM+R7BKVjg/EurrO3wxWT8/Zm1MCC4N2ybXZ6 TQFniOWct6QFLAusP0NDM0SklfHNp84kTe2edXoc1uagN5SiuM+Dbc9M0a8M3c9r178n RU0ZYe6a88lGDns/5afQRdH6TrLeGOaJ5P36Bqqt2aypodJoj96ZkzexHUwjaTwZefhx i6ww== 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=omrsQVq4dZzH0AlhjlQerOgwR99PJdEg2m87KVnOv+E=; b=BwbS/Bw6tLZWv8W1XQ6FNo7dIG/vA1QmIAf4TVGQ2HraSTF3X/01iZOsqBi7RhIxoi V6gxfhLym9xzucoo7ByHSWncHyS/wBqaLgWuM+mqLY9v0bEtBQ3Z0OL8MzeK0xS2i7Vv 1yazunBbVQrMMMOrdAKkt4t+I9hkNpvluARyswOqKgT1YOMB4mtwKr4djnoe/ynLv/NE L2PsJ4keoPno92eaeFuw6hpwWCmq8MSu4N2FUCw0RpcORiRanqjRpGEgkeVjYDIdjAn1 n8gVkbKBuW/YpcmM/xmAgKrhhnSgQ4iMTjFEDJr4TddZ27OKiAJ/emSTQLhCuytcoNOD M8pQ== X-Gm-Message-State: AFeK/H2ba9bLrnO5ScHfGN3ZgPojtVQ7F/cjrmAofplHuUxEIJN4jhCImuzX/Fw2CitTnS4t9qfw8JP5ao1S8Q== X-Received: by 10.176.86.26 with SMTP id y26mr19153142uaa.77.1491593125958; Fri, 07 Apr 2017 12:25:25 -0700 (PDT) Original-Received: by 10.176.71.131 with HTTP; Fri, 7 Apr 2017 12:24:55 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c08::22d 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:213777 Archived-At: On 7 April 2017 at 20:23, Richard Copley wrote: > On 7 April 2017 at 20:09, Noam Postavsky wrote: >> On Fri, Apr 7, 2017 at 2:06 PM, Richard Copley wrote: >> >>>>> http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=bdfee01a6567b9f08f82bc84d1196e6cb62587ca >>> >>> 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? >>> >> >> You seem to be talking about ediff or emerge, but this thread is about >> smerge which operates in a single buffer, no windows involved. > > Thanks, I knew I must have been missing something. IMO making > smerge weird is a disadvantage of this change. Sorry. Let's say I meant emerge.