ignore merge failure patches

saulius · Dec 1, 2011 · b2d1225 · b2d1225
1 parent dcf468f
commit b2d1225
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,5 +23,7 @@ pkg
 .yardoc/*
 dist
 Gemfile.lock
+*.orig
+*.rej
 
 ## PROJECT::SPECIFIC