Aggressive three-way merge: fix D/F case

diff --git a/attr.h b/attr.h
index f1c2038b0923d3130937eef965667204a8634e6d..69b5767ebc2189a8bf9d98ff88c1885ec8fcdb7d 100644 (file)
--- a/attr.h
+++ b/attr.h
@@ -31,4 +31,11 @@ struct git_attr_check {
 
 int git_checkattr(const char *path, int, struct git_attr_check *);
 
+enum git_attr_direction {
+       GIT_ATTR_CHECKIN,
+       GIT_ATTR_CHECKOUT,
+       GIT_ATTR_INDEX,
+};
+void git_attr_set_direction(enum git_attr_direction, struct index_state *);
+
 #endif /* ATTR_H */