builtin/merge.c: drop a parameter that is never used

diff --git a/parse-options-cb.c b/parse-options-cb.c
index 0de5fb168a5c1b86c50be0d0c3f2d7228e7159a1..be8c413cfebb414bcbb7815cf4fe42bc31444d65 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -33,6 +33,12 @@ int parse_opt_approxidate_cb(const struct option *opt, const char *arg,
        return 0;
 }
 
+int parse_opt_expiry_date_cb(const struct option *opt, const char *arg,
+                            int unset)
+{
+       return parse_expiry_date(arg, (unsigned long *)opt->value);
+}
+
 int parse_opt_color_flag_cb(const struct option *opt, const char *arg,
                            int unset)
 {