builtin-merge: show user-friendly error messages for fast-forward too.

diff --git a/attr.h b/attr.h
index 3a2f4ec1a09cca06fadedeb32bd86c5e279ad75c..69b5767ebc2189a8bf9d98ff88c1885ec8fcdb7d 100644 (file)
--- a/attr.h
+++ b/attr.h
@@ -33,7 +33,8 @@ int git_checkattr(const char *path, int, struct git_attr_check *);
 
 enum git_attr_direction {
        GIT_ATTR_CHECKIN,
-       GIT_ATTR_CHECKOUT
+       GIT_ATTR_CHECKOUT,
+       GIT_ATTR_INDEX,
 };
 void git_attr_set_direction(enum git_attr_direction, struct index_state *);