From: Daira Hopwood 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/?a=commitdiff_plain;h=1de1bf7df45eb8fd2315937dd17e0ef4bb832401;p=tahoe-lafs%2Ftahoe-lafs.git .gitignore: changes to facilitate cloud backend merge (rebased). Signed-off-by: Daira Hopwood --- 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