builtin-merge: refresh the index before calling a strategy

diff --git a/Makefile b/Makefile
index e0c03c3eecc26d995f8829429092e887df17489f..15ca6599a7b665d5d4888c00b0fecd7bbde28879 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -648,6 +648,7 @@ ifeq ($(uname_S),SunOS)
        NO_MEMMEM = YesPlease
        NO_HSTRERROR = YesPlease
        NO_MKDTEMP = YesPlease
+       OLD_ICONV = UnfortunatelyYes
        ifeq ($(uname_R),5.8)
                NEEDS_LIBICONV = YesPlease
                NO_UNSETENV = YesPlease