X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.c;h=500ebcfd545772fb17e5fb14bba42bf4be468b75;hb=bd9a2688454c09431101869e75c5a47f08c05b1a;hp=b68ec820dde935eb2578a8983c265290d0511add;hpb=06a054014b23494f5ace2699e2aaf7b35757e010;p=git.git

diff --git a/unpack-trees.c b/unpack-trees.c
index b68ec820d..500ebcfd5 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -16,7 +16,7 @@
  * situation better.  See how "git checkout" and "git merge" replaces
  * them using setup_unpack_trees_porcelain(), for example.
  */
-const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
+static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
 	/* ERROR_WOULD_OVERWRITE */
 	"Entry '%s' would be overwritten by merge. Cannot merge.",