diff --git a/src/merge.sh b/src/merge.sh deleted file mode 100644 index 567d5c92..00000000 --- a/src/merge.sh +++ /dev/null @@ -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