X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=82b19a4d91e921883d3602791831d0882936b606;hb=b0ef8cb4b2a4056fc7df7c16aa6a170edb4dea34;hp=65e07090f26d3de5d1ffca1f19b0ff4d37c89c23;hpb=1269230d28c43a67a51b74a5b42fd906be6a172a;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 65e07090..82b19a4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,9 @@ merge-clean:
 	@find ./ | $(GREP) \.orig | xargs rm -f
 	@find ./ | $(GREP) \.rej | xargs rm -f
 	@find ./ | $(GREP) \.rpm | xargs rm -f
+	@find ./ | $(GREP) \.THIS | xargs rm -f
+	@find ./ | $(GREP) \.OTHER | xargs rm -f
+	@find ./ | $(GREP) \.BASE | xargs rm -f
 	@find ./ | $(GREP) \~$$ | xargs rm -f
 	@echo "Files that need to be either removed or checked in:"
 	@bzr unknowns