Commit Diff

Commit:
66c06eb12bec7b816963355327e0b3b53db5e881
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Message:
add missed option conflict check for histedit -e and -f Reviewed as part of previous commit adding histedit -d. ok stsp@
Actions:
Patch | Tree
commit - f1c9fe20d35f9b64cee89491805039b13c91c8de
commit + 66c06eb12bec7b816963355327e0b3b53db5e881
blob - c3fba8983edfdcd9d44dd210f16023a6428a67cd
blob + 60c761947d9b8dfb848269d6bba3e25b341bf7d6
--- 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)