Merge branch 'jc/userdiff-pattern-hint'
commite1eb13347610bd5b062377f2e8d7f807c6e89d07
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Aug 2021 23:06:03 +0000 (30 16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Aug 2021 23:06:03 +0000 (30 16:06 -0700)
treea037bc462bd3bfed23955e3e3dcf9a3880cacfa2
parent669277c551604fddcb4dc9dac888cd956cccacd3
parentb6029b3279ef5997796de99ce9319a5f1499df21
Merge branch 'jc/userdiff-pattern-hint'

Remind developers that the userdiff patterns should be kept simple
and permissive, assuming that the contents they apply are always
syntactically correct.

* jc/userdiff-pattern-hint:
  userdiff: comment on the builtin patterns
userdiff.c