unpack-trees: oneway_merge to update submodules

diff --git a/column.h b/column.h
index 4f178d84a80f3f5212c389a684dec556d8f7d403..0a61917fa75484622e39ef54bfbc7d8a43b059ed 100644 (file)
--- a/column.h
+++ b/column.h
@@ -39,4 +39,7 @@ static inline int column_active(unsigned int colopts)
 extern void print_columns(const struct string_list *list, unsigned int colopts,
                          const struct column_options *opts);
 
+extern int run_column_filter(int colopts, const struct column_options *);
+extern int stop_column_filter(void);
+
 #endif