Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()

diff --git a/config.mak.in b/config.mak.in
index addda4f16c243b6b4ce875a39909c95b2afe94db..eb9d7a55496492fa021e8262f052c7f46b60ea20 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -3,10 +3,10 @@
 
 CC = @CC@
 CFLAGS = @CFLAGS@
-PIC_FLAG = @PIC_FLAG@
 AR = @AR@
 TAR = @TAR@
 #INSTALL = @INSTALL@           # needs install-sh or install.sh in sources
+TCLTK_PATH = @TCLTK_PATH@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -14,7 +14,6 @@ bindir = @bindir@
 #gitexecdir = @libexecdir@/git-core/
 datarootdir = @datarootdir@
 template_dir = @datadir@/git-core/templates/
-GIT_PYTHON_DIR = @datadir@/git-core/python
 
 mandir=@mandir@
 
@@ -24,7 +23,6 @@ VPATH = @srcdir@
 export exec_prefix mandir
 export srcdir VPATH
 
-NO_PYTHON=@NO_PYTHON@
 NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
 NO_OPENSSL=@NO_OPENSSL@
 NO_CURL=@NO_CURL@
@@ -39,4 +37,5 @@ NO_C99_FORMAT=@NO_C99_FORMAT@
 NO_STRCASESTR=@NO_STRCASESTR@
 NO_STRLCPY=@NO_STRLCPY@
 NO_SETENV=@NO_SETENV@
+NO_ICONV=@NO_ICONV@