Skip to content

Commit be8945f

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix-missing-tests-reports
2 parents c4005d7 + d8d2007 commit be8945f

File tree

457 files changed

+7831
-4967
lines changed

Some content is hidden

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

457 files changed

+7831
-4967
lines changed

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