Merge branch 'mf/no-dashed-subcommands'

diff --git a/git-gui/Makefile b/git-gui/Makefile
index fe30be38dc8c534cabf8a0f7145c41aecd1e6989..918a8de369113bb022f5080ac9c516771f544577 100644 (file)
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -161,7 +161,9 @@ ifeq ($(uname_S),Darwin)
        endif
 endif
 ifneq (,$(findstring MINGW,$(uname_S)))
+ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
        NO_MSGFMT=1
+endif
        GITGUI_WINDOWS_WRAPPER := YesPlease
        GITGUI_RELATIVE := 1
 endif