Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/shallow.c b/shallow.c
index 3d53d17423a73a1e206ee631c33ec7a88c40707a..dbd9f5ad0ac21e70fc3a095d8e2938f245c238d3 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -17,7 +17,7 @@ int register_shallow(const unsigned char *sha1)
        return register_commit_graft(graft, 0);
 }
 
-int is_repository_shallow()
+int is_repository_shallow(void)
 {
        FILE *fp;
        char buf[1024];
@@ -101,4 +101,3 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
 
        return result;
 }
-