X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=.gitignore;h=304cb09c0691598ae58cd525f8d31d7a84b40d28;hb=5ff51765abd1fbd081682c7806ef490533033753;hp=a63dd0d7ca74fcf95ce29ed3460796515fbaf330;hpb=9923693c419d20baeffeb2d9699deae699e6f5af;p=debian6500.git

diff --git a/.gitignore b/.gitignore
index a63dd0d..304cb09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,19 @@
 config.log
 prod
 prod_rhp*
+
+#####################################################################
+# Temp/IDE generated files
+#####################################################################
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os
+*.orig
 .*project
 .settings