Remove housekeeping command files inadvertently checked in.

merge.sh stub/merge.sh committer: jreiser <jreiser> 959051481 +0000
2000-05-23 03:11:21 +00:00
parent 08057f2a85
commit 51b6b071b5
1 changed files with 0 additions and 10 deletions
@@ -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