diff --git a/src/stub/merge.sh b/src/stub/merge.sh deleted file mode 100644 index d878d07f..00000000 --- a/src/stub/merge.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -x - -for i in Makefile *.h *.c *.ash *.asm *.lds -do - diff3 -m ./$i ../../../upx-ancestor/src/stub/$i ../../../upx-1.10/src/stub/$i > tmp.$$ - mv tmp.$$ ./$i - read junk -done