Merge branch 'da/difftool' into maint

diff --git a/builtin/rm.c b/builtin/rm.c
index 8829b09d0ba5d49edbad5f37f8246123dad3fd5f..be83c4347a9cd6fdd6a76a9575f8e39a5b2bd6c2 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -314,7 +314,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
                list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode);
                if (list.entry[list.nr++].is_submodule &&
                    !is_staging_gitmodules_ok())
-                       die (_("Please, stage your changes to .gitmodules or stash them to proceed"));
+                       die (_("Please stage your changes to .gitmodules or stash them to proceed"));
        }
 
        if (pathspec.nr) {