thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 02:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21580 from azat/git--arcadia_skip_list-union-merge

Browse Source 
[RFC] Union merge for arcadia_skip_list.txt to avoid frequent conflicts
This commit is contained in:
Alexander Kuzmenkov 2021-03-11 21:10:38 +03:00 committed by GitHub
commit ae8585a183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1,2 +1,4 @@
contrib/* linguist-vendored contrib/* linguist-vendored
*.h linguist-language=C++ *.h linguist-language=C++
# to avoid frequent conflicts
tests/queries/0_stateless/arcadia_skip_list.txt text merge=union

2
tests/queries/0_stateless/arcadia_skip_list.txt
View File

@ -212,7 +212,7 @@
01017_uniqCombined_memory_usage 01017_uniqCombined_memory_usage
01747_join_view_filter_dictionary 01747_join_view_filter_dictionary
01748_dictionary_table_dot 01748_dictionary_table_dot
00950_dict_get, 00950_dict_get
01683_flat_dictionary 01683_flat_dictionary
01681_cache_dictionary_simple_key 01681_cache_dictionary_simple_key
01682_cache_dictionary_complex_key 01682_cache_dictionary_complex_key