src/TortoiseProc/Commands/ConflictEditorCommand.cpp

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