[native] Fix gitattributes

prestodb · Dec 1, 2022 · ef40144 · ef40144
1 parent 2ad80f0
commit ef40144
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/presto-native-execution/presto_cpp/main/thrift/.gitattributes b/presto-native-execution/presto_cpp/main/thrift/.gitattributes
@@ -2,7 +2,7 @@ presto_thrift.json -diff -merge
 presto_thrift.json linguist-generated=true
 presto_protocol-to-thrift-json.json -diff -merge
 presto_protocol-to-thrift-json.json linguist-generated=true
-ProtocolToThrift.cpp -diff -merge
+ProtocolToThrift.cpp -merge
 ProtocolToThrift.cpp linguist-generated=true
-ProtocolToThrift.h -diff -merge
+ProtocolToThrift.h -merge
 ProtocolToThrift.h linguist-generated=true
diff --git a/presto-native-execution/presto_cpp/main/types/.gitattributes b/presto-native-execution/presto_cpp/main/types/.gitattributes
@@ -1,2 +1,2 @@
-antlr/*     -diff -merge
+antlr/*     -merge
 antlr/*     linguist-generated=true
diff --git a/presto-native-execution/presto_cpp/presto_protocol/.gitattributes b/presto-native-execution/presto_cpp/presto_protocol/.gitattributes
@@ -1,6 +1,6 @@
-presto_protocol.h     -diff -merge
+presto_protocol.h     -merge
 presto_protocol.h     linguist-generated=true
-presto_protocol.cpp   -diff -merge
+presto_protocol.cpp   -merge
 presto_protocol.cpp   linguist-generated=true
 presto_protocol.proto -diff -merge
 presto_protocol.proto linguist-generated=true