ignore merge failure patches

Jerry Cheung · Jerry Cheung · commit 50dd90bb2274 · 2011-12-01T08:31:35.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -23,5 +23,7 @@ pkg
 .yardoc/*
 dist
 Gemfile.lock
+*.orig
+*.rej
 
 ## PROJECT::SPECIFIC
