X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=.gitignore;h=78006ce2b7ae315957e475b507ba1a5e5693787c;hb=523a941d19374d4487e504db519114df07d9b480;hp=f9a26768ae7410a9403f3d87bec5d3829bcb0ab9;hpb=810306cb85accaaace9a50f174264f105991230b;p=c11tester.git

diff --git a/.gitignore b/.gitignore
index f9a26768..78006ce2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
 # generic types
 *.o
 .*.swp
+*.swo
 *.so
 *~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
+*.dot
 
 # files in this directory
-/model
 /tags
+/doc/docs
+/make.deps
+/benchmarks