From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 13:42:51 -0500 Message-ID: <87bpgg672s.fsf@red-bean.com> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> <83d40w69hv.fsf@gnu.org> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264531395 13903 80.91.229.12 (26 Jan 2010 18:43:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 18:43:15 +0000 (UTC) Cc: Eli Zaretskii , rms@gnu.org, emacs-devel@gnu.org To: Lennart Borgman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 19:43:07 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 1NZqNW-0005Li-Od for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 19:43:07 +0100 Original-Received: from localhost ([127.0.0.1]:40537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZqNY-0007Zs-6J for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 13:43:08 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZqNT-0007ZU-2Y for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:43:03 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZqNN-0007Z9-B0 for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:43:01 -0500 Original-Received: from [199.232.76.173] (port=58052 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZqNN-0007Z6-5o for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:42:57 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.206.141]:51207) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZqNK-0004jp-JI; Tue, 26 Jan 2010 13:42:54 -0500 Original-Received: from localhost ([127.0.0.1]:49547 helo=kfogel-work ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.71) (envelope-from ) id 1NZqNJ-0008I4-On; Tue, 26 Jan 2010 12:42:53 -0600 In-Reply-To: (Lennart Borgman's message of "Tue, 26 Jan 2010 19:20:22 +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 (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:120461 Archived-At: Lennart Borgman writes: >This thread is over my head, I do not have time to capture the >details. Could the conclusions from the discussion (when it is >somewhat ready) please be put on the EmacsWiki page? It's too long for me too. But since some people may be expecting me to maintain BzrForEmacsDevs, this is an explicit request for someone who understands what the heck has been concluded here to please update the page if necessary! Thanks, -Karl