From: Yuval Kogman <nothingmuch@woobling.org>
Date: Wed, 28 Jan 2009 13:29:23 GMT
Subject: Re: [PATCH] Add --ff-only flag to git-merge
Message-ID: <a891e1bd0901280529v296914bdod8f33a1db4846c47@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.0901281425180.3586@pacific.mpi-cbg.de>

2009/1/28 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> If you compare the two if() lines, you will see that you mixed style.

Thanks,

I will be fixing it here:

http://github.com/nothingmuch/git/tree/ff-only

before I send a new version, as I likely screwed up many things, not
just that =)