From: Kimmo Varis <kimmov@gmail.com>
Date: Tue, 20 Feb 2007 16:26:52 +0000 (+0000)
Subject: Remove commented out lines
X-Git-Tag: 2.16.5~4381
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3c9b4cf2aeff5eb510c32c2c67b1c11389f0ef55;p=winmerge-jp%2Fwinmerge-jp.git

Remove commented out lines
---

diff --git a/Src/Changes.txt b/Src/Changes.txt
index d3ea74752..83a626835 100644
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -8,6 +8,8 @@ Add new items to top.
    resource.h
   Src/editlib: ccrystaltextview.cpp
   Src/Languages/*: Merge*.rc
+ Remove commented out lines
+  Src: DiffWrapper.cpp
 
 2007-02-19 Kimmo
  PATCH: [ 1663012 ] Fix total count for compare progress dialog
diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index 049447e27..3a58f1713 100644
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -21,7 +21,7 @@
  *
  * @date  Created: 2003-08-22
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #include "stdafx.h"
@@ -160,7 +160,6 @@ void CDiffWrapper::GetOptions(DIFFOPTIONS *options)
 	DIFFOPTIONS tmpOptions = {0};
 	m_options.GetAsDiffOptions(tmpOptions);
 	*options = tmpOptions;
-//	InternalGetOptions(options);
 }
 
 /**
@@ -173,7 +172,6 @@ void CDiffWrapper::SetOptions(const DIFFOPTIONS *options)
 {
 	ASSERT(options);
 	m_options.SetFromDiffOptions(*options);
-//	InternalSetOptions(options);
 }
 
 /**
@@ -815,7 +813,6 @@ BOOL CDiffWrapper::RunFileDiff()
 		strFile2Temp.Empty();
 	}
 
-//	SwapToGlobalSettings();
 	return bRet;
 }