From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sat, 26 Jul 2008 12:33:45 GMT
Subject: Re: [PATCH] t7601: extend the 'merge picks up the best result' test
Message-ID: <20080726123345.GH32057@genesis.frugalware.org>
In-Reply-To: <1217073292-27945-1-git-send-email-vmiklos@frugalware.org>

On Sat, Jul 26, 2008 at 01:54:45PM +0200, Miklos Vajna <vmiklos@frugalware.org> wrote:
> The test only checked if the best result picking code works if there are
> multiple strategies set in the config. Add a similar one that tests if
> the same true if the -s option of git merge was used multiple times.

Ignore this one. I run git send-email *.patch when sending out the other
series and forgot to do an rm *.patch before format-patch.

Sorry,
Miklos