userdiff: fix grammar and style issues
Signed-off-by: Boxuan Li <liboxuan@connect.hku.hk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Boxuan Li committed
May 30, 2019 at 00:15 UTC
2731a7840a462a97b8afb5beadaf36c1db992ac7
2 files changed
+5
-3
Documentation/gitattributes.txt
+1
-1
@@ -819,7 +819,7 @@ patterns are available:
819
820
- `java` suitable for source code in the Java language.
821
822
-- `matlab` suitable for source code in the MATLAB and Octave language.
822
+- `matlab` suitable for source code in the MATLAB and Octave languages.
823
824
- `objc` suitable for source code in the Objective-C language.
825
userdiff.c
+4
-2
@@ -58,9 +58,11 @@ PATTERNS("java",
58
"|[-+*/<>%&^|=!]="
59
"|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
60
PATTERNS("matlab",
61
- /* Octave pattern is mostly the same as matlab, except that '%%%' and
61
+ /*
62
+ * Octave pattern is mostly the same as matlab, except that '%%%' and
63
* '##' can also be used to begin code sections, in addition to '%%'
63
- * that is understood by both. */
64
+ * that is understood by both.
65
+ */
66
"^[[:space:]]*((classdef|function)[[:space:]].*)$|^(%%%?|##)[[:space:]].*$",
67
"[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"),
68
PATTERNS("objc",