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: Tue, 26 Jan 2010 11:51:49 +0100 Message-ID: References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> <83hbq95w75.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264503141 8918 80.91.229.12 (26 Jan 2010 10:52:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 10:52:21 +0000 (UTC) Cc: ofv@wanadoo.es, stephen@xemacs.org, rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 11:52:12 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 1NZj1l-0006jD-0c for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 11:52:09 +0100 Original-Received: from localhost ([127.0.0.1]:46538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZj1l-0005Ya-VC for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 05:52:10 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZj1c-0005Y0-4x for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:52:00 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZj1X-0005WL-2h for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:51:59 -0500 Original-Received: from [199.232.76.173] (port=33572 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZj1W-0005WE-RT for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:51:54 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:36165) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZj1U-0008Mc-B8; Tue, 26 Jan 2010 05:51:52 -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 C728F1C1582A; Tue, 26 Jan 2010 11:51:50 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 8FC5590210; Tue, 26 Jan 2010 11:51:50 +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 Dnvx6spb2A3D; Tue, 26 Jan 2010 11:51:49 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.144.89.ip-pool.NEFkom.net [83.171.144.89]) by mail.mnet-online.de (Postfix) with ESMTP; Tue, 26 Jan 2010 11:51:49 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 87715CA296; Tue, 26 Jan 2010 11:51:49 +0100 (CET) X-Yow: Mary Tyler Moore's SEVENTH HUSBAND is wearing my DACRON TANK TOP in a cheap hotel in HONOLULU! In-Reply-To: (Eli Zaretskii's message of "Tue, 26 Jan 2010 05:31:16 -0500") 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:120430 Archived-At: Eli Zaretskii writes: > Trivially, as pushing from a private branch. How do you define a private branch? 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."