From 635035ca64e9c6e6ad8252545446bbf9bc2a9c55 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Tue, 1 Sep 2009 15:20:39 -0500
Subject: PR10552: Removed references to the merge ('-M') option. * hash.cxx
 (find_script_hash): Removed unused merge option. * main.cxx (checkOptions):
 Removed merge option checks.   (main): Removed merge option. * session.h:
 Ditto. * initscript/README.initscript: Removed reference to '-M' option. *
 initscript/systemtap.in (stap_getopt): Ditto. *
 testsuite/parseko/cmdline01.stp: Removed merge option test. *
 testsuite/parseko/cmdline05.stp: Ditto.

---
 session.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'session.h')

diff --git a/session.h b/session.h
index 24e6ae80..a2176793 100644
--- a/session.h
+++ b/session.h
@@ -107,7 +107,6 @@ struct systemtap_session
   bool listing_mode_vars;
   bool bulk_mode;
   bool unoptimized;
-  bool merge;
   bool suppress_warnings;
   int buffer_size;
   unsigned perfmon;
-- 
cgit