Allow specifying specialized merge-backend per path.

diff --git a/cache.h b/cache.h
index b1bd9e46c2bd64e00b671ff5ed512d9c12b53309..38ad00661d5e0f5cc9f0d959c4c65c8c1ed238d9 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -151,6 +151,9 @@ enum object_type {
 #define CONFIG_ENVIRONMENT "GIT_CONFIG"
 #define CONFIG_LOCAL_ENVIRONMENT "GIT_CONFIG_LOCAL"
 #define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
+#define GITATTRIBUTES_FILE ".gitattributes"
+#define INFOATTRIBUTES_FILE "info/attributes"
+#define ATTRIBUTE_MACRO_PREFIX "[attr]"
 
 extern int is_bare_repository_cfg;
 extern int is_bare_repository(void);