]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/userdiff-cpp'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Oct 2021 23:06:59 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Oct 2021 23:06:59 +0000 (16:06 -0700)
Userdiff patterns for the C++ language has been updated.

* js/userdiff-cpp:
  userdiff-cpp: back out the digit-separators in numbers
  userdiff-cpp: learn the C++ spaceship operator
  userdiff-cpp: permit the digit-separating single-quote in numbers
  userdiff-cpp: prepare test cases with yet unsupported features
  userdiff-cpp: tighten word regex
  t4034: add tests showing problematic cpp tokenizations
  t4034/cpp: actually test that operator tokens are not split


Trivial merge