Fix merge miss branch info

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

diff --git a/src/TortoiseProc/Commands/MergeCommand.cpp b/src/TortoiseProc/Commands/MergeCommand.cpp
index 38bf467..98a569b 100644 (file)
--- a/src/TortoiseProc/Commands/MergeCommand.cpp
+++ b/src/TortoiseProc/Commands/MergeCommand.cpp
@@ -40,7 +40,7 @@ bool MergeCommand::Execute()
                cmd.Format(_T("git.exe merge %s %s %s"),\r
                        noff,\r
                        squash,\r
-                       dlg.m_Base);\r
+                       dlg.m_VersionName);\r
 \r
                CString output;\r
                g_Git.Run(cmd,&output);\r

diff --git a/src/TortoiseProc/MergeDlg.h b/src/TortoiseProc/MergeDlg.h
index 95a93d2..2967bb0 100644 (file)
--- a/src/TortoiseProc/MergeDlg.h
+++ b/src/TortoiseProc/MergeDlg.h
@@ -5,7 +5,7 @@
 #include "ChooseVersion.h"\r
 // CMergeDlg dialog\r
 \r
-class CMergeDlg : public CResizableStandAloneDialog,CChooseVersion\r
+class CMergeDlg : public CResizableStandAloneDialog,public CChooseVersion\r
 {\r
        DECLARE_DYNAMIC(CMergeDlg)\r
 \r
@@ -19,7 +19,7 @@ public:
        BOOL m_bSquash;\r
        BOOL m_bNoFF;\r
 \r
-       CString m_Base;\r
+       //CString m_Base;\r
 \r
 \r
 protected:\r