mergetool: Use args as pathspec to unmerged files

[git.git] / userdiff.c

diff --git a/userdiff.c b/userdiff.c
index 42b86ac63d734280ac85ea829a910c4aa375dfcd..e55310cd02c8e7d1f0404b2fee9539e7340993d9 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -74,7 +74,7 @@ PATTERNS("perl",
                "(:[^;#]*)?"
                "(\\{[ \t]*)?" /* brace can come here or on the next line */
                "(#.*)?$\n" /* comment */
-        "^[A-Z]+[ \t]*"        /* BEGIN, END, ... */
+        "^(BEGIN|END|INIT|CHECK|UNITCHECK|AUTOLOAD|DESTROY)[ \t]*"
                "(\\{[ \t]*)?" /* brace can come here or on the next line */
                "(#.*)?$\n"
         "^=head[0-9] .*",      /* POD */