git-reset to remove "$GIT_DIR/MERGE_MSG"

diff --git a/index-pack.c b/index-pack.c
index 042aea8842b531254e9a2d0ec67cbaeb40990575..8331d99a62a457cb341a834792aedf5de9c5625f 100644 (file)
--- a/index-pack.c
+++ b/index-pack.c
@@ -90,7 +90,7 @@ static SHA_CTX input_ctx;
 static int input_fd, output_fd, mmap_fd;
 
 /* Discard current buffer used content. */
-static void flush()
+static void flush(void)
 {
        if (input_offset) {
                if (output_fd >= 0)