summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-04-15 13:50:15 -0700
committerJunio C Hamano <gitster@pobox.com>2025-04-15 13:50:16 -0700
commit7b7fe0a898978618c36432f1f89b29cd412c7a23 (patch)
tree456501d1f3f81df9046ac65b41e27c681aff0acb /userdiff.c
parentd5baf636a431c54d0f306ed98775797c171373b2 (diff)
parent43380056df44aed6e074689dc8bc940f9dc6e2c8 (diff)
Merge branch 'lo/userdiff-gitconfig'
* lo/userdiff-gitconfig: userdiff: add builtin driver for INI files
Diffstat (limited to 'userdiff.c')
-rw-r--r--userdiff.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/userdiff.c b/userdiff.c
index 340c4eb4f7..da75625020 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -211,6 +211,10 @@ PATTERNS("html",
"^[ \t]*(<[Hh][1-6]([ \t].*)?>.*)$",
/* -- */
"[^<>= \t]+"),
+PATTERNS("ini",
+ "^[ \t]*\\[[^]]+\\]",
+ /* -- */
+ "[^ \t]+"),
PATTERNS("java",
"!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
/* Class, enum, interface, and record declarations */