merge: remove drop_save() in favor of remove_merge_branch_state()

diff --git a/config.mak.uname b/config.mak.uname
index b37fa8424c88cae23abf02f8276e8b4f6ffef19a..2011bac6d54ebb66544c94aa27453e2545a7a34a 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -567,7 +567,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
        NO_GETTEXT = YesPlease
        COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
 else
-       ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
+       ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
                # MSys2
                prefix = /usr/
                ifeq (MINGW32,$(MSYSTEM))