summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5925934..07b76b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,7 @@ autom4te.cache
config.sub
depcomp
missing
+
+# Merge and patch files to ignore
+*.orig
+*.patch \ No newline at end of file