X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=.gitignore;h=87a360b8f81bc16a7c6d47e0976a96e2969866a1;hb=3db33d420266c30a058d2a22b2a4d7d74cfe5c98;hp=5b16382834d10bfe74365446cde3f127f082cb6a;hpb=cd8225a9e0a574f347a476e57151c2c689a66887;p=debian6500.git

diff --git a/.gitignore b/.gitignore
index 5b16382..87a360b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ prod_rhp*
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os