]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jh/userdiff-python-async'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:44 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:44 +0000 (12:52 -0800)
The userdiff machinery has been taught that "async def" is another
way to begin a "function" in Python.

* jh/userdiff-python-async:
  userdiff: support Python async functions

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge