builtin-merge: show user-friendly error messages for fast-forward too.

diff --git a/grep.h b/grep.h
index 28e6b2a8ec0af7d0e86d9b955cef075b0ecd9652..f6eecc62c038f212fa4efc8648f13f61bf937452 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -59,6 +59,7 @@ struct grep_opt {
        struct grep_pat *pattern_list;
        struct grep_pat **pattern_tail;
        struct grep_expr *pattern_expression;
+       const char *prefix;
        int prefix_length;
        regex_t regexp;
        int linenum;