From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: =?utf-8?Q?=C3=93scar_Fuentes?= <ofv@wanadoo.es>
Newsgroups: gmane.emacs.devel
Subject: Re: master bdfee01: Change Smerge "Mine" and "Other" for "Upper" and
	"Lower. (Bug#20878)
Date: Sun, 31 Jan 2016 04:24:48 +0100
Message-ID: <87powiig73.fsf@wanadoo.es>
References: <20160131030211.14758.83627@vcs.savannah.gnu.org>
	<E1aPiHD-0003qe-Dj@vcs.savannah.gnu.org>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
X-Trace: ger.gmane.org 1454210736 28290 80.91.229.3 (31 Jan 2016 03:25:36 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Sun, 31 Jan 2016 03:25:36 +0000 (UTC)
Cc: Glenn Morris <rgm@gnu.org>
To: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 31 04:25:24 2016
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1aPidf-00082A-C3
	for ged-emacs-devel@m.gmane.org; Sun, 31 Jan 2016 04:25:23 +0100
Original-Received: from localhost ([::1]:40398 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1aPidZ-0002EL-Mk
	for ged-emacs-devel@m.gmane.org; Sat, 30 Jan 2016 22:25:17 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44800)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ofv@wanadoo.es>) id 1aPidM-0002Ds-UI
	for emacs-devel@gnu.org; Sat, 30 Jan 2016 22:25:05 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ofv@wanadoo.es>) id 1aPidM-0008OZ-4W
	for emacs-devel@gnu.org; Sat, 30 Jan 2016 22:25:04 -0500
Original-Received: from smtp09.acens.net ([86.109.99.133]:17077 helo=smtp.movistar.es)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ofv@wanadoo.es>)
	id 1aPidE-0008M5-Su; Sat, 30 Jan 2016 22:24:57 -0500
X-CTCH-RefID: str=0001.0A0B0201.56AD7E81.00A1, ss=1, re=0.000, recu=0.000,
	reip=0.000, cl=1, cld=1, fgs=0
X-CTCH-VOD: Unknown
X-CTCH-Spam: Unknown
Original-Received: from qcore (83.38.42.1) by smtp.movistar.es (8.6.122.03)
	(authenticated as 981711563$telefonica.net)
	id 56A37EDC00882AA8; Sun, 31 Jan 2016 03:24:49 +0000
In-Reply-To: <E1aPiHD-0003qe-Dj@vcs.savannah.gnu.org> (Glenn Morris's message
	of "Sun, 31 Jan 2016 03:02:11 +0000")
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic]
X-Received-From: 86.109.99.133
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:199071
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/199071>

[snip]

Thank you. This mine/other thing caused me lots of confussion.
Upper/lower is obvious. A pity that it is not included in Emacs 25.