Extend merge-clean

diff --git a/Makefile.am b/Makefile.am
index 65e07090f26d3de5d1ffca1f19b0ff4d37c89c23..82b19a4d91e921883d3602791831d0882936b606 100644 (file)
--- 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