merge-trees: let caller decide whether to renormalize

diff --git a/parse-options.h b/parse-options.h
index 678b58db8e49d9c9f8a11811e632dd9b81a9d9a8..7435cdbf1d94378cf1c3408ae17cb610165a00ba 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -36,7 +36,8 @@ enum parse_opt_option_flags {
        PARSE_OPT_LASTARG_DEFAULT = 16,
        PARSE_OPT_NODASH = 32,
        PARSE_OPT_LITERAL_ARGHELP = 64,
-       PARSE_OPT_NEGHELP = 128
+       PARSE_OPT_NEGHELP = 128,
+       PARSE_OPT_SHELL_EVAL = 256
 };
 
 struct option;