summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbri <284789+b-@users.noreply.github.com>2022-07-16 14:38:56 -0400
committerGitHub <noreply@github.com>2022-07-17 04:38:56 +1000
commit847cca541c3666e687fc5ad6a0d3ba1733b89d81 (patch)
treece614176d20efa5538c29d2fd30aab0e8f0d21d4
parent9cdccb12d112c13e79f127ca686bbe81b8fcef6f (diff)
Add .orig to .gitignore (#17626)
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index de2627d9d6..51b0a38e0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@
.DS_Store
._*
+# Merge files
+*.orig
+*.rej
+
# Build artifacts
.clang_complete
.build/