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

diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c
index 6b55f931cbd8b79a01057b55eb41a043a4db5e3b..b097c888a0da044d6dc78c9747eb18e45b46709d 100644 (file)
--- a/builtin-checkout-index.c
+++ b/builtin-checkout-index.c
@@ -45,7 +45,7 @@
 static int line_termination = '\n';
 static int checkout_stage; /* default to checkout stage0 */
 static int to_tempfile;
-static char topath[4][MAXPATHLEN+1];
+static char topath[4][PATH_MAX + 1];
 
 static struct checkout state;