merge: save merge state earlier

[git-core/git.git] / builtin / prune-packed.c

diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index c026299..ac978ad 100644 (file)
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -10,7 +10,7 @@ static const char * const prune_packed_usage[] = {
 
 static struct progress *progress;
 
-static int prune_subdir(int nr, const char *path, void *data)
+static int prune_subdir(unsigned int nr, const char *path, void *data)
 {
        int *opts = data;
        display_progress(progress, nr + 1);