From 23103b8d6c1ba0524fa1766d9df961ad97567d53 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Fri, 24 Jun 2011 13:05:15 -0700
Subject: [PATCH] Extend merge-clean

---
 Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
2.30.2