(test suite) changes in test suite due to upgrading to F17

- git version bumps up, causes minor change in t/merge-check.t
  - for some strange reason apache cannot see /tmp/gitolite-http-authuserfile
    (I thought private /tmp was only if you enabled selinux...)

t/merge-check.t

@@ -34,7 +34,7 @@ try "
 try "
     cd foo;             ok
     ls -Al;             ok;     /\.git/
-    test-commit aa;     ok;     /1 files changed, 1 insertions/
+    test-commit aa;     ok;     /1 file changed, 1 insertion/
     tag start;          ok
     glt push u1 origin master
                         ok;     /new branch.*master.-..master/