Merge pull request #1899 from saper/resgencond

[mono.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e5b638b53e876f7e84a53986c778fa3d6f435fdf..1cb061f77894615a877ca23c16bcce6acb8e816d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,6 @@
 *.tlb
 *.tlh
 *.bak
-*.[Cc]ache
 *.ilk
 *.log
 *.lib
@@ -44,6 +43,8 @@ Ankh.NoLoad
 _ReSharper*/
 *.resharper
 [Tt]est[Rr]esult*
+*.orig
+*.rej
 
 # NuGet packages
 !.nuget/*