oneway_merge(): only lstat() when told to update worktree

diff --git a/config.mak.in b/config.mak.in
index b2ba7104ebc87c0f2fe261f16461793fcc8b8cd3..802d34223a2859ee1341d94ee722d7939b7276aa 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -28,7 +28,6 @@ VPATH = @srcdir@
 export exec_prefix mandir
 export srcdir VPATH
 
-ASCIIDOC7=@ASCIIDOC7@
 NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
 NO_OPENSSL=@NO_OPENSSL@
 NO_CURL=@NO_CURL@