src/TortoiseProc/Commands/ConflictEditorCommand.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2008-2009 - TortoiseSVN
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19 #pragma once
  20 #include "stdafx.h"
  21 #include "ConflictEditorCommand.h"
  22 #include "GitStatus.h"
  23 #include "GitDiff.h"
  24 //#include "SVNInfo.h"
  25 #include "UnicodeUtils.h"
  26 #include "PathUtils.h"
  27 #include "AppUtils.h"
  28 //#include "EditPropConflictDlg.h"
  29 //#include "TreeConflictEditorDlg.h"
  30
  31 bool ConflictEditorCommand::Execute()
  32 {
  33         bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
  34         return CAppUtils::ConflictEdit(this->cmdLinePath,bAlternativeTool);
  35 }