X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=82b19a4d91e921883d3602791831d0882936b606;hb=61bb2c3a16c0c9723bbb6492283e349a8ccdf11f;hp=65e07090f26d3de5d1ffca1f19b0ff4d37c89c23;hpb=28adf7b936c6f5c25b7526ff56ec1256da1246d4;p=m6w6%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