From f35bcf26161673f1ae398cc28cb623f6c04b3024 Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Wed, 9 Apr 2014 00:46:57 +0100
Subject: [PATCH] .gitignore: changes to facilitate cloud backend merge
 (rebased).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index ee1a24cf..398fd153 100644
--- 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
-- 
2.45.2