ls-files: --others should not say unmerged paths are unknown.

diff --git a/hash-object.c b/hash-object.c
index 0821e543f57caa264f0cff292f4c7dbe1ed0f148..c8c9adb3aa789729e3c53a0d9ff1135367e93ee0 100644 (file)
--- a/hash-object.c
+++ b/hash-object.c
@@ -21,7 +21,7 @@ static void hash_object(const char *path, const char *type, int write_object)
        printf("%s\n", sha1_to_hex(sha1));
 }
 
-static const char *hash_object_usage =
+static const char hash_object_usage[] =
 "git-hash-object [-t <type>] [-w] <file>...";
 
 int main(int argc, char **argv)