From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 00:57:27 +0100 Message-ID: <871vhdybyw.fsf@telefonica.net> References: <87iqaq1f09.fsf@telefonica.net> <877hr61c68.fsf@telefonica.net> <87iqaqyy6s.fsf@telefonica.net> <87eileys7h.fsf@telefonica.net> <87aaw2yrec.fsf@telefonica.net> <87r5pexbm6.fsf@telefonica.net> <87my02xa5l.fsf@telefonica.net> <87iqaqx81j.fsf@telefonica.net> <87eildyj1q.fsf@telefonica.net> <87aaw1ydqy.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1264463893 12169 80.91.229.12 (25 Jan 2010 23:58:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 23:58:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 00:58:06 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NZYon-0001c2-JM for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 00:58:05 +0100 Original-Received: from localhost ([127.0.0.1]:41238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZYoo-0003nJ-Vb for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 18:58:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZYoj-0003mC-JV for emacs-devel@gnu.org; Mon, 25 Jan 2010 18:58:01 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZYod-0003ie-Ub for emacs-devel@gnu.org; Mon, 25 Jan 2010 18:58:00 -0500 Original-Received: from [199.232.76.173] (port=55646 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZYod-0003iY-Qj for emacs-devel@gnu.org; Mon, 25 Jan 2010 18:57:55 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:42862) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZYod-0007gD-9s for emacs-devel@gnu.org; Mon, 25 Jan 2010 18:57:55 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZYoX-0001WG-N4 for emacs-devel@gnu.org; Tue, 26 Jan 2010 00:57:49 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Jan 2010 00:57:49 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Jan 2010 00:57:49 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 11 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:xqLA5U6yOxXBzYCW/wyXdDctvrw= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120403 Archived-At: Andreas Schwab writes: > Óscar Fuentes writes: > >> First, please let's bar the word "push" and its derivatives from Bazaar >> discussions. > > Since when has bzr elided the push command? This discussion of ours turned to be too long. You already forgot how this thread started :-)