Merge branch 'ln/userdiff-elixir'
commitba6b66281ebc8d863c2b0fb27ede640e4f212dd9
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Dec 2019 19:21:59 +0000 (25 11:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Dec 2019 19:21:59 +0000 (25 11:21 -0800)
tree07666f6eef10a5f960d0a3bce3c97fdb391f680d
parentbd72a08d6ce451e7d4725d6b3b411d482333e5cb
parentd1b1384d6163efb85c3a93ee535cd795d92fec21
Merge branch 'ln/userdiff-elixir'

Hotfix.

* ln/userdiff-elixir:
  userdiff: remove empty subexpression from elixir regex
userdiff.c