Skip to content

Commit 13f4d0d

Browse files
committed
Merge branch 'master' into bitshift-throw-error-for-negative-shift-positions
2 parents e7e2b09 + 1981640 commit 13f4d0d

442 files changed

Lines changed: 12456 additions & 4277 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ contrib/* linguist-vendored
22
*.h linguist-language=C++
33
tests/queries/0_stateless/data_json/* binary
44
tests/queries/0_stateless/*.reference -crlf
5+
src/Core/SettingsChangesHistory.cpp merge=union

0 commit comments

Comments
 (0)