Merge branch 'fc/prompt-zsh-read-from-file'

diff --git a/diff.c b/diff.c
index e343191bdaba0dbf63a841a79287cbb5f56fc18a..539997fc6a679b2d85479a4d8f12f864d92b6c7c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3927,7 +3927,7 @@ static int diff_scoreopt_parse(const char *opt)
                }
        }
        if (cmd != 'M' && cmd != 'C' && cmd != 'B')
-               return -1; /* that is not a -M, -C nor -B option */
+               return -1; /* that is not a -M, -C, or -B option */
 
        opt1 = parse_rename_score(&opt);
        if (cmd != 'B')