checkout,merge: loosen overwriting untracked file check based on info/exclude

diff --git a/git-compat-util.h b/git-compat-util.h
index 877096ecb09e524174ff22db3722d6428f43bcf4..81883e7270daadafb4d827e894fa4645ff2e2b66 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -160,6 +160,10 @@ extern char *gitbasename(char *);
 #define PRIx32 "x"
 #endif
 
+#ifndef PRIo32
+#define PRIo32 "o"
+#endif
+
 #ifndef PATH_SEP
 #define PATH_SEP ':'
 #endif