commit b380533788adf056655d5bdf9d7e497e53c5d85f
from: Stefan Sperling <stsp@stsp.name>
date: Sun Dec 13 11:40:10 2020 UTC

histedit -f conflicts with -F option

Also fixed as part of a different patch from jrick

ok jrick

commit - ff69268e3d2a6d3adf3c7b6a1284fca5ac8fc62a
commit + b380533788adf056655d5bdf9d7e497e53c5d85f
blob - 61bddc52712435101039c7a89b6ceb8ffe0f5b1f
blob + 4df2db7f021912a09dd421ede13f9b680c18aa24
--- got/got.c
+++ 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();