mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Remove housekeeping command files inadvertently checked in.

Browse Source 
merge.sh stub/merge.sh

committer: jreiser <jreiser> 959051481 +0000
This commit is contained in:
John Reiser 2000-05-23 03:11:21 +00:00
parent 08057f2a85
commit 51b6b071b5
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/merge.sh
View File

@ -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