From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: [PATCH] Fix a number of potential infinite loops due to unsgined underflow. Date: Mon, 11 Feb 2013 15:38:49 +0100 Message-ID: <87d2w6j3u8.fsf@bzg.ath.cx> References: <1360378897-22577-1-git-send-email-tom.prince@ualberta.net> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:55564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4upN-0005jL-3p for emacs-orgmode@gnu.org; Mon, 11 Feb 2013 09:57:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4upL-00025H-6R for emacs-orgmode@gnu.org; Mon, 11 Feb 2013 09:57:52 -0500 Received: from mail-wi0-f172.google.com ([209.85.212.172]:42923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4upK-00025A-Uj for emacs-orgmode@gnu.org; Mon, 11 Feb 2013 09:57:51 -0500 Received: by mail-wi0-f172.google.com with SMTP id ez12so3237760wid.17 for ; Mon, 11 Feb 2013 06:57:50 -0800 (PST) In-Reply-To: <1360378897-22577-1-git-send-email-tom.prince@ualberta.net> (Tom Prince's message of "Fri, 8 Feb 2013 20:01:37 -0700") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Tom Prince Cc: Andrew Young , emacs-orgmode@gnu.org Hi Tom, Tom Prince writes: > I discovered this, when trying to merge a file, with a tag that > overhangs the right margin. Trying to merge the following line > with itself (with --rmargin less than 10) the causes the driver > to output spaces forever: Good to know people are using Andrew's work! Andrew, are you still maintainer this git merge driver? Thanks, -- Bastien