apply: register conflicted stages to the index

diff --git a/parse-options.h b/parse-options.h
index def9ced739b675cbcdac7598c3baebf5423239a0..da999f8995ee79865bd4c2f72a1e009502a69926 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -234,5 +234,7 @@ extern int parse_opt_noop_cb(const struct option *, const char *, int);
          PARSE_OPT_OPTARG, &parse_opt_abbrev_cb, 0 }
 #define OPT__COLOR(var, h) \
        OPT_COLOR_FLAG(0, "color", (var), (h))
+#define OPT_COLUMN(s, l, v, h) \
+       { OPTION_CALLBACK, (s), (l), (v), "style", (h), PARSE_OPT_OPTARG, parseopt_column_callback }
 
 #endif