Clean up merge leftovers too.

dak180 · dak180 · commit 6712a6360603 · 2016-11-15T13:17:07.000-05:00
diff --git a/Makefile b/Makefile
@@ -108,6 +108,7 @@ clean:
 devclean: clean
 	rm -f autorevision.cache
 	rm -f AUTHORS AUTHORS.txt
+	rm -f *.orig ./*/*.orig
 
 # HTML versions of doc files suitable for use on a website
 docs: \
