commit 54fdcaee61b11a4ba039fce945d3a7e59ef477fc
from: Mark Jamsek <mark@jamsek.dev>
via: Thomas Adam <thomas@xteddy.org>
date: Tue Jan 31 15:41:39 2023 UTC

add missed option conflict check for histedit -e and -f

Reviewed as part of previous commit adding histedit -d.

ok stsp@

commit - 070c80a59d5048ca05990df52d7993f3015c2ee4
commit + 54fdcaee61b11a4ba039fce945d3a7e59ef477fc
blob - 26f94faab531e5b6bfa3c5e7cf0f1d547a900326
blob + a251edd8ab6b000c9ac3692077d7af1f3d54bbd8
--- got/got.c
+++ got/got.c
@@ -12283,6 +12283,8 @@ cmd_histedit(int argc, char *argv[])
 		option_conflict('e', 'm');
 	if (edit_script_path && edit_only)
 		option_conflict('F', 'e');
+	if (fold_only && edit_only)
+		option_conflict('f', 'e');
 	if (drop_only && abort_edit)
 		option_conflict('d', 'a');
 	if (drop_only && continue_edit)