Add orig files from merge tools to .gitignore

b4f585b0 · Daniel Gerhardt · 79cb66a4 · b4f585b0
Commit b4f585b0 authored 9 years ago by Daniel Gerhardt
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.bak
 *.iml
 *.log
+*.orig
 .*.sw?
 .classpath
 .directory