ignore git merge conflicts

thegarage · Jul 10, 2014 · 075e469 · 075e469
1 parent 73eba79
commit 075e469
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,9 @@ tmtags
 ## VIM
 *.swp
 
+## GIT
+*.orig
+
 ## PROJECT::GENERAL
 coverage
 rdoc