^config.(log|status)$
^libtool$
^autom4te.cache$
-^include/(libmemcached_config.h(.in)?|stamp-h1)$
+^libmemcached/(libmemcached_config.h(.in)?|stamp-h1)$
+^libmemcached/libmemcached_config.h.in$
+^stamp-h1$
+^lib/libmemcachedPlus.la$
+^tests/testplus$
+
# Build artifacts
-^lib/libmemcached.la$
-^src/mem(cat|cp|flush|rm|slap|stat)$
+^libmemcached/libmemcached.la$
+^clients/mem(cat|cp|flush|rm|slap|stat|error)$
^tests/testapp$
+.(deps|libs)/*$
+.cmp$
+autom4te.cache/*$
+.(gz|cmp|tar|rpm|srpm)$
+support/libmemcached.pc$
+support/libmemcached.spec$
+docs/pod2htmd.tmp
+docs/pod2htmi.tmp
+libmemcached/memcachedplus.loT
+tests/atomsmasher
+tests/startservers
+tests/stopservers
+tests/udptest
+
+
Makefile(.in)?$
.(deps|libs)$
# Generated man files
\.1$
\.3$
+
+# Merged files
+\.orig$