general improvements

diff --git a/ll-merge.h b/ll-merge.h
index b9e2af1c884042adda8127a07ce8565b64303047..e78973dd55ed596e26dcf4a372671ad03b97986a 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -26,5 +26,6 @@ int ll_merge(mmbuffer_t *result_buf,
             const struct ll_merge_options *opts);
 
 int ll_merge_marker_size(struct index_state *istate, const char *path);
+void reset_merge_attributes(void);
 
 #endif