Add .orig to .gitignore (#17626)

3 years ago · 847cca541c
parent 9cdccb12d1
commit 847cca541c
1 changed files with 4 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,10 @@
 .DS_Store
 ._*

+# Merge files
+*.orig
+*.rej
+
 # Build artifacts
 .clang_complete
 .build/