From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sun, 15 Nov 2009 01:10:44 GMT
Subject: Re: [PATCH] Check the format of more printf-type functions
Message-ID: <20091115011044.GL23718@genesis.frugalware.org>
In-Reply-To: <1258234393-5093-1-git-send-email-tarmigan+git@gmail.com>

On Sat, Nov 14, 2009 at 01:33:13PM -0800, Tarmigan Casebolt <tarmigan+git@gmail.com> wrote:
> it for others to make a proper fix.  Looks like Miklos touched that line
> last, so perhaps he knows of a better fix.

I just added struct merge_options, the real change is commit a97e407
(Keep rename/rename conflicts of intermediate merges while doing
recursive merge, 2007-03-31), adding Alex to Cc.