Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint

diff --git a/builtin-apply.c b/builtin-apply.c
index f312798af38553e0badeda9732736a62460eae05..a6643386435d60743f70b5124caa2628a6b17d81 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -3212,7 +3212,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
 
        struct option builtin_apply_options[] = {
                { OPTION_CALLBACK, 0, "exclude", NULL, "path",
-                       "don´t apply changes matching the given path",
+                       "don't apply changes matching the given path",
                        0, option_parse_exclude },
                { OPTION_CALLBACK, 0, "include", NULL, "path",
                        "apply changes matching the given path",