Remove housekeeping command files inadvertently checked in.

merge.sh stub/merge.sh

committer: jreiser <jreiser> 959051481 +0000

src/merge.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -x
-
-for i in *.h *.cpp
-do
-	diff3 -m ./$i ../../upx-ancestor/src/$i ../../upx-1.10/src/$i  > tmp.$$
-	mv tmp.$$ ./$i
-	read junk
-done