user-manual.txt: prefer 'merge --abort' over 'reset --hard'

diff --git a/parse-options.h b/parse-options.h
index 7d83e2971d9afa11b11d6187bd96afb88cbb6118..9a90c332a55b840dca6e62b7950c858f4f67c7d5 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -257,6 +257,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 
 int parse_options_end(struct parse_opt_ctx_t *ctx);
 
+struct option *parse_options_dup(const struct option *a);
 struct option *parse_options_concat(struct option *a, struct option *b);
 
 /*----- some often used options -----*/