merge script: --squash, --ff from unborn branch are errors

diff --git a/t/t5100/patch0005 b/t/t5100/patch0005
index e7d6f666083c65e152571153f63691596ed9d193..7d24b24af83c861a1dc615c19cbaa392fdd69dec 100644 (file)
--- a/t/t5100/patch0005
+++ b/t/t5100/patch0005
@@ -61,7 +61,7 @@ diff --git a/git-cvsimport-script b/git-cvsimport-script
                push(@old,$fn);
 
 -- 
-David Kågedal
+David Kågedal
 -
 To unsubscribe from this list: send the line "unsubscribe git" in
 the body of a message to majordomo@vger.kernel.org