Add no-commit option at merge dialog

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / MergeDlg.cpp

diff --git a/src/TortoiseProc/MergeDlg.cpp b/src/TortoiseProc/MergeDlg.cpp
index 36b7cb6..78faada 100644 (file)
--- a/src/TortoiseProc/MergeDlg.cpp
+++ b/src/TortoiseProc/MergeDlg.cpp
@@ -53,6 +53,7 @@ void CMergeDlg::DoDataExchange(CDataExchange* pDX)
 \r
        DDX_Check(pDX,IDC_CHECK_NOFF,this->m_bNoFF);\r
        DDX_Check(pDX,IDC_CHECK_SQUASH,this->m_bSquash);\r
+       DDX_Check(pDX,IDC_CHECK_NOCOMMIT,this->m_bNoCommit);\r
        DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);\r
 }\r
 \r