merge-recursive: adjust to loosened "working file clobbered" check

diff --git a/config.mak.in b/config.mak.in
index fecae802d1397e7b7d97c5edd5ca4359e363e8cf..1cafa19ed4e4b9ecb683e4bc6c4aaa3ac3322b74 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -38,4 +38,5 @@ NO_C99_FORMAT=@NO_C99_FORMAT@
 NO_STRCASESTR=@NO_STRCASESTR@
 NO_STRLCPY=@NO_STRLCPY@
 NO_SETENV=@NO_SETENV@
+NO_ICONV=@NO_ICONV@