diff options
Diffstat (limited to 'll-merge.h')
| -rw-r--r-- | ll-merge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h index b9e2af1c88..e78973dd55 100644 --- 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 |