merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c
index 0d63c4498c0c10193846c020a2d76958bd12e1bd..6c8cc3edc1f5fec4e2aa173f2650a69db5e065f0 100644 (file)
--- a/builtin/update-server-info.c
+++ b/builtin/update-server-info.c
@@ -3,7 +3,7 @@
 #include "parse-options.h"
 
 static const char * const update_server_info_usage[] = {
-       "git update-server-info [--force]",
+       N_("git update-server-info [--force]"),
        NULL
 };
 
@@ -11,7 +11,7 @@ int cmd_update_server_info(int argc, const char **argv, const char *prefix)
 {
        int force = 0;
        struct option options[] = {
-               OPT__FORCE(&force, "update the info files from scratch"),
+               OPT__FORCE(&force, N_("update the info files from scratch")),
                OPT_END()
        };