Merge branch 'cc/test-oidmap'

diff --git a/unpack-trees.c b/unpack-trees.c
index 50189909b86d6ab48a0aa15893f5b66c2e9ce613..dab713203e15a83e452119d0140bb4c28c8a7bf0 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -315,7 +315,7 @@ static struct progress *get_progress(struct unpack_trees_options *o)
                        total++;
        }
 
-       return start_delayed_progress(_("Checking out files"), total);
+       return start_delayed_progress(_("Updating files"), total);
 }
 
 static void setup_collided_checkout_detection(struct checkout *state,