From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 21:56:25 +0100 Message-ID: References: <87ockiflg2.fsf@mithlond.arda> <87636q2x2q.fsf@telefonica.net> <87my021ham.fsf@telefonica.net> <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> 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 1264453013 2371 80.91.229.12 (25 Jan 2010 20:56:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 20:56:53 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 21:56:45 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 1NZVzD-0002Xb-8U for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 21:56:39 +0100 Original-Received: from localhost ([127.0.0.1]:38184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZVzE-00083z-7W for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 15:56:40 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZVz8-00083i-26 for emacs-devel@gnu.org; Mon, 25 Jan 2010 15:56:34 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZVz3-00083S-Jn for emacs-devel@gnu.org; Mon, 25 Jan 2010 15:56:33 -0500 Original-Received: from [199.232.76.173] (port=37749 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZVz3-00083P-Do for emacs-devel@gnu.org; Mon, 25 Jan 2010 15:56:29 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:53612) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZVz3-0001ZX-Ga for emacs-devel@gnu.org; Mon, 25 Jan 2010 15:56:29 -0500 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id BA5651C1589A; Mon, 25 Jan 2010 21:56:27 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 6543A90162; Mon, 25 Jan 2010 21:56:27 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan1.mnet-online.de [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id nncKzDT0vK6N; Mon, 25 Jan 2010 21:56:26 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.176.225.ip-pool.NEFkom.net [83.171.176.225]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 25 Jan 2010 21:56:26 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id C51BFCA296; Mon, 25 Jan 2010 21:56:25 +0100 (CET) X-Yow: Is this going to involve RAW human ecstasy? In-Reply-To: <87iqaqx81j.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Mon, 25 Jan 2010 21:07:36 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120393 Archived-At: Óscar Fuentes writes: > You are not interested on bisecting my 3 commits branch that > implemented a small feature, are you? Sure I am. If one of the 3 commits was the one that broke it. That's the whole point of bisection. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."