Fixed issue #232: "No Commit" Option always acitve

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseProc/Commands/MergeCommand.cpp b/src/TortoiseProc/Commands/MergeCommand.cpp
index f3feefc..4781208 100644 (file)
--- a/src/TortoiseProc/Commands/MergeCommand.cpp
+++ b/src/TortoiseProc/Commands/MergeCommand.cpp
@@ -39,7 +39,7 @@ bool MergeCommand::Execute()
                if(dlg.m_bSquash)\r
                        squash=_T("--squash");\r
 \r
-               if(dlg.m_bNoCommit);\r
+               if(dlg.m_bNoCommit)\r
                        nocommit=_T("--no-commit");\r
 \r
                if(!dlg.m_strLogMesage.IsEmpty())\r

diff --git a/src/TortoiseProc/MergeDlg.cpp b/src/TortoiseProc/MergeDlg.cpp
index 78faada..514be6f 100644 (file)
--- a/src/TortoiseProc/MergeDlg.cpp
+++ b/src/TortoiseProc/MergeDlg.cpp
@@ -38,6 +38,9 @@ CMergeDlg::CMergeDlg(CWnd* pParent /*=NULL*/)
 {\r
        \r
        m_pDefaultText = _T("<Auto Generated by Git>");\r
+       m_bNoFF=false;\r
+       m_bSquash=false;\r
+       m_bNoCommit=false;\r
        \r
 }\r
 \r