From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Oct 2021 23:06:59 +0000 (-0700)
Subject: Merge branch 'js/userdiff-cpp'
X-Git-Tag: v2.34.0-rc0~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3f157ff2774527a84bad7df1a95a63b7a2f4a4b;p=thirdparty%2Fgit.git

Merge branch 'js/userdiff-cpp'

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
---

f3f157ff2774527a84bad7df1a95a63b7a2f4a4b