From 51b6b071b552fc6cd2b79ff98630c7691961888c Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Tue, 23 May 2000 03:11:21 +0000
Subject: [PATCH] Remove housekeeping command files inadvertently checked in. 
 merge.sh stub/merge.sh

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

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