X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitignore;h=5c2abdcaafe65f2ae9e2182fdb909229f778f893;hb=fbb7220527c04fb8b07aa777c2f46c26e35f56ed;hp=6d9e56f2c3d4d51cec17f5575fc488ce95525f68;hpb=982781e599e5289f9e5861c5f580b72df499963c;p=cmccabe-bin

diff --git a/.gitignore b/.gitignore
index 6d9e56f..5c2abdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ show_default_sockopts
 print-code-points
 hexconv
 msgpack-translate
+directory_merge
 
 #
 # Normal rules