1 // TortoiseSVN - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2008-2009 - 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
21 #include "ConflictEditorCommand.h"
\r
22 #include "GitStatus.h"
\r
23 #include "GitDiff.h"
\r
24 //#include "SVNInfo.h"
\r
25 #include "UnicodeUtils.h"
\r
26 #include "PathUtils.h"
\r
27 #include "AppUtils.h"
\r
28 //#include "EditPropConflictDlg.h"
\r
29 //#include "TreeConflictEditorDlg.h"
\r
31 bool ConflictEditorCommand::Execute()
\r
33 bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
\r
34 return CAppUtils::ConflictEdit(this->cmdLinePath,bAlternativeTool);
\r