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: Conflicts in rmail.el Date: Tue, 15 Nov 2011 16:46:09 -0500 Message-ID: References: <87k4712lwk.fsf@gmail.com> <834ny5dtcd.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1321393586 28487 80.91.229.12 (15 Nov 2011 21:46:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 15 Nov 2011 21:46:26 +0000 (UTC) Cc: emacs-devel@gnu.org, Thierry Volpiatto To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 15 22:46:22 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RQQpg-0000le-Nm for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 22:46:20 +0100 Original-Received: from localhost ([::1]:52929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQQpg-0001Ub-2L for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 16:46:20 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:40336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQQpd-0001TN-4D for emacs-devel@gnu.org; Tue, 15 Nov 2011 16:46:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQQpc-0007ex-8b for emacs-devel@gnu.org; Tue, 15 Nov 2011 16:46:17 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:58287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQQpa-0007eA-Ff; Tue, 15 Nov 2011 16:46:16 -0500 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id pAFLk9r4017742; Tue, 15 Nov 2011 16:46:09 -0500 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 3731913002C; Tue, 15 Nov 2011 16:46:09 -0500 (EST) In-Reply-To: <834ny5dtcd.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 15 Nov 2011 22:27:30 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.91 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4042=0 X-NAI-Spam-Version: 2.2.0.9286 : core <4042> : streams <701669> : uri <1007991> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 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:146047 Archived-At: >> could someone fix existings conflicts in rmail.el? > Just "bzr revert" and move on. Well, "bzr revert" throws away all the changes you may have, so it's not necessarily a good idea. But yes: those conflict are resolved by choosing any of the three options (and I really mean any: it shouldn't matter much which one you choose). Stefan