1 // TortoiseSVN - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2007-2008 - TortoiseSVN
\r
5 // This program is free software; you can redistribute it and/or
\r
6 // modify it under the terms of the GNU General Public License
\r
7 // as published by the Free Software Foundation; either version 2
\r
8 // of the License, or (at your option) any later version.
\r
10 // This program is distributed in the hope that it will be useful,
\r
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
13 // GNU General Public License for more details.
\r
15 // You should have received a copy of the GNU General Public License
\r
16 // along with this program; if not, write to the Free Software Foundation,
\r
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
20 #include "MergeCommand.h"
\r
22 #include "MergeDlg.h"
\r
23 #include "MessageBox.h"
\r
25 bool MergeCommand::Execute()
\r
28 if(dlg.DoModal()==IDOK)
\r
40 squash=_T("--squash");
\r
42 if(dlg.m_bNoCommit);
\r
43 nocommit=_T("--no-commit");
\r
45 if(!dlg.m_strLogMesage.IsEmpty())
\r
47 msg+=_T("-m \"")+dlg.m_strLogMesage+_T("\"");
\r
49 cmd.Format(_T("git.exe merge %s %s %s %s %s"),
\r
57 g_Git.Run(cmd,&output,CP_ACP);
\r
59 CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);
\r