From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re' Date: Sat, 27 Jun 2009 02:26:44 +0200 Message-ID: References: <200906131725.n5DHPaEt009392@outgoing.mit.edu> Reply-To: Stefan Monnier , 3553@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1246063064 2731 80.91.229.12 (27 Jun 2009 00:37:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 27 Jun 2009 00:37:44 +0000 (UTC) Cc: 3553@emacsbugs.donarmstrong.com To: Nelson Elhage Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 27 02:37:36 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MKLvD-0004W5-S6 for geb-bug-gnu-emacs@m.gmane.org; Sat, 27 Jun 2009 02:37:36 +0200 Original-Received: from localhost ([127.0.0.1]:59611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MKLvD-0000jY-3W for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Jun 2009 20:37:35 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MKLv9-0000iQ-0d for bug-gnu-emacs@gnu.org; Fri, 26 Jun 2009 20:37:31 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MKLv4-0000e1-Pz for bug-gnu-emacs@gnu.org; Fri, 26 Jun 2009 20:37:30 -0400 Original-Received: from [199.232.76.173] (port=38432 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MKLv4-0000dw-Bb for bug-gnu-emacs@gnu.org; Fri, 26 Jun 2009 20:37:26 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:52216) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MKLv3-0004m4-M3 for bug-gnu-emacs@gnu.org; Fri, 26 Jun 2009 20:37:26 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n5R0bNSW005176; Fri, 26 Jun 2009 17:37:23 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n5R0U9Ee003736; Fri, 26 Jun 2009 17:30:09 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sat, 27 Jun 2009 00:30:09 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 3553 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 3553-submit@emacsbugs.donarmstrong.com id=B3553.12460624103475 (code B ref 3553); Sat, 27 Jun 2009 00:30:09 +0000 Original-Received: (at 3553) by emacsbugs.donarmstrong.com; 27 Jun 2009 00:26:50 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from smtp-02.vtx.ch (smtp-02.vtx.ch [212.147.0.114]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n5R0QkPd003468 for <3553@emacsbugs.donarmstrong.com>; Fri, 26 Jun 2009 17:26:47 -0700 Original-Received: from alfajor.home (dyn.83-228-218-202.dsl.vtx.ch [83.228.218.202]) by smtp-02.vtx.ch (VTX Services SA) with ESMTP id 436F15FBBD; Sat, 27 Jun 2009 02:26:45 +0200 (CEST) Original-Received: by alfajor.home (Postfix, from userid 20848) id 0AFC264341; Sat, 27 Jun 2009 02:26:44 +0200 (CEST) In-Reply-To: <200906131725.n5DHPaEt009392@outgoing.mit.edu> (Nelson Elhage's message of "Sat, 13 Jun 2009 13:25:36 -0400 (EDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.94 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 26 Jun 2009 20:37:30 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:29004 Archived-At: > With merge.conflictstyle=diff3, 'git' generates diff3-style conflict > markers, with mine/base/other sections, but for the 'base' marker, it > only outputs "|||||||\n", with no comment after it. This causes smerge > to miss the base marker, since smerge assumes a comment, and defines: > (defconst smerge-base-re "^||||||| .*\n") > Simply replacing that with > (defconst smerge-base-re "^|||||||.*\n") > Should allow smerge-mode to handle git conflicts, and I can't imagine > it should cause any false-positives otherwise. I'd rather fix Git so it uses the standard format. Stefan