.gitignore: changes to facilitate cloud backend merge (rebased).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/.gitignore b/.gitignore
index ee1a24cf6369df39669e291573ff380f221fd104..398fd1532a4bdd854dc0766634a878aedeb10a93 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,12 @@
 *~
 *.DS_Store
 .*.kate-swp
+*.orig
+*.rej
 
 /build/
 /support/
+/_darcs/
 
 # these are generated at build time, and never checked in
 /src/allmydata/_version.py
@@ -34,3 +37,4 @@ zope.interface-*.egg
 /coverage-html/
 /miscaptures.txt
 /violations.txt
+/*.diff