From: Johannes Schindelin Date: Sat, 30 Jun 2007 14:28:17 GMT Subject: Re: [PATCH] git-merge-ff: fast-forward only merge Message-ID: In-Reply-To: <11831937823756-git-send-email-sam.vilain@catalyst.net.nz> Hi, On Sat, 30 Jun 2007, Sam Vilain wrote: > Documentation/merge-strategies.txt | 5 +++++ > Makefile | 2 +- > git-merge-ff.sh | 8 ++++++++ > git-merge.sh | 4 ++-- Still no test script that could tell you if it does what it is supposed to be... Ciao, Dscho