From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 8 Apr 2014 23:46:57 +0000 (+0100)
Subject: .gitignore: changes to facilitate cloud backend merge (rebased).
X-Git-Url: https://git.rkrishnan.org/pf/content/en/vdrive?a=commitdiff_plain;h=61727bf2ec1001a61b19f36c99218c92629367e8;p=tahoe-lafs%2Ftahoe-lafs.git

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

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

diff --git a/.gitignore b/.gitignore
index 1d261e5d..ea774243 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
@@ -33,3 +36,4 @@ zope.interface-*.egg
 /coverage-html/
 /miscaptures.txt
 /violations.txt
+/*.diff