From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Sat, 15 Nov 2014 11:01:47 -0500 Message-ID: References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <54677406.8030907@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416067341 4654 80.91.229.3 (15 Nov 2014 16:02:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 16:02:21 +0000 (UTC) Cc: emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 17:02:14 2014 Return-path: 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 ) id 1Xpfni-000533-0R for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 17:02:14 +0100 Original-Received: from localhost ([::1]:40942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpfnh-0007ta-Ms for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 11:02:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpfnP-0007tB-Rq for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:02:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpfnI-0003vK-DS for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:01:55 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:8719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpfnI-0003vF-9o for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:01:48 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsUIAGA2ZVRLd+sd/2dsb2JhbABbDoMAimLLDAQCAoEcFwEBAQEBAXyEAwEBAwFWIwULCzQSFBgNJIhLCdEEAQEBAQYBAQEBHpEUB4RLBYwLj06EHpMrgXaDPF4fgnsBAQE X-IPAS-Result: AsUIAGA2ZVRLd+sd/2dsb2JhbABbDoMAimLLDAQCAoEcFwEBAQEBAXyEAwEBAwFWIwULCzQSFBgNJIhLCdEEAQEBAQYBAQEBHpEUB4RLBYwLj06EHpMrgXaDPF4fgnsBAQE X-IronPort-AV: E=Sophos;i="5.07,380,1413259200"; d="scan'208";a="97087909" Original-Received: from 75-119-235-29.dsl.teksavvy.com (HELO pastel.home) ([75.119.235.29]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 15 Nov 2014 11:01:47 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 4229185E5; Sat, 15 Nov 2014 11:01:47 -0500 (EST) In-Reply-To: <54677406.8030907@cs.ucla.edu> (Paul Eggert's message of "Sat, 15 Nov 2014 07:40:54 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:177191 Archived-At: > To be honest, I never used bzrmerge.el the few times that I merged, and > I doubt whether anybody noticed. Only you could notice, since the point of bzrmerge.el is to auto-resolve the merge conflicts. Stefan