Commit b380533788adf056655d5bdf9d7e497e53c5d85f
2020-12-13T11:40:10
histedit -f conflicts with -F option Also fixed as part of a different patch from jrick ok jrick
diff --git a/got/got.c b/got/got.c
index 61bddc5..4df2db7 100644
--- a/got/got.c
+++ b/got/got.c
@@ -8643,6 +8643,8 @@ cmd_histedit(int argc, char *argv[])
option_conflict('c', 'f');
if (fold_only && edit_logmsg_only)
option_conflict('f', 'm');
+ if (edit_script_path && fold_only)
+ option_conflict('F', 'f');
if (argc != 0)
usage_histedit();