From 2ca813394e0f1f429c5fe2e50d3b14ec430f685f Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Mon, 30 Nov 2009 22:44:17 +0800
Subject: [PATCH] Fixed issue #232: "No Commit" Option always acitve

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/TortoiseProc/Commands/MergeCommand.cpp | 2 +-
 src/TortoiseProc/MergeDlg.cpp              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/TortoiseProc/Commands/MergeCommand.cpp b/src/TortoiseProc/Commands/MergeCommand.cpp
index f3feefc..4781208 100644
--- a/src/TortoiseProc/Commands/MergeCommand.cpp
+++ b/src/TortoiseProc/Commands/MergeCommand.cpp
@@ -39,7 +39,7 @@ bool MergeCommand::Execute()
 		if(dlg.m_bSquash)
 			squash=_T("--squash");
 
-		if(dlg.m_bNoCommit);
+		if(dlg.m_bNoCommit)
 			nocommit=_T("--no-commit");
 
 		if(!dlg.m_strLogMesage.IsEmpty())
diff --git a/src/TortoiseProc/MergeDlg.cpp b/src/TortoiseProc/MergeDlg.cpp
index 78faada..514be6f 100644
--- a/src/TortoiseProc/MergeDlg.cpp
+++ b/src/TortoiseProc/MergeDlg.cpp
@@ -38,6 +38,9 @@ CMergeDlg::CMergeDlg(CWnd* pParent /*=NULL*/)
 {
 	
 	m_pDefaultText = _T("<Auto Generated by Git>");
+	m_bNoFF=false;
+	m_bSquash=false;
+	m_bNoCommit=false;
 	
 }
 
-- 
2.11.0