]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
.gitignore: changes to facilitate cloud backend merge (rebased).
authorDaira Hopwood <daira@jacaranda.org>
Tue, 8 Apr 2014 23:46:57 +0000 (00:46 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Fri, 10 Jul 2015 03:10:58 +0000 (04:10 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
.gitignore

index ee1a24cf6369df39669e291573ff380f221fd104..398fd1532a4bdd854dc0766634a878aedeb10a93 100644 (file)
@@ -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