From 82a16bd4f2b65d0f46d4e2f7cc21c00cd18227a5 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Tue, 23 May 2000 03:13:36 +0000
Subject: [PATCH] Remove housekeeping file inadvertently checked in.

committer: jreiser <jreiser> 959051616 +0000
---
 src/stub/merge.sh | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 src/stub/merge.sh

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