Merge gitk to pick up emergency build fix

diff --git a/column.h b/column.h
index 72cf5396670f8a41ea1dda20b7d412fa2a1eb027..448c7440b3f0eb6a3c7e86fb775e3506b079b452 100644 (file)
--- a/column.h
+++ b/column.h
@@ -29,7 +29,7 @@ struct column_options {
 struct option;
 int parseopt_column_callback(const struct option *, const char *, int);
 int git_column_config(const char *var, const char *value,
-                            const char *command, unsigned int *colopts);
+                     const char *command, unsigned int *colopts);
 int finalize_colopts(unsigned int *colopts, int stdout_is_tty);
 static inline int column_active(unsigned int colopts)
 {
@@ -38,7 +38,7 @@ static inline int column_active(unsigned int colopts)
 
 struct string_list;
 void print_columns(const struct string_list *list, unsigned int colopts,
-                         const struct column_options *opts);
+                  const struct column_options *opts);
 
 int run_column_filter(int colopts, const struct column_options *);
 int stop_column_filter(void);