Use processdlg to format patch.
[TortoiseGit.git] / src / TortoiseProc / Commands / MergeCommand.h
blobe71fcdc471b93072b827c74eb24a5b6b08b41a2d
1 // TortoiseSVN - a Windows shell extension for easy version control
3 // Copyright (C) 2007 - TortoiseSVN
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.
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.
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.
19 #pragma once
20 #include "Command.h"
22 #include "MessageBox.h"
24 /**
25 * \ingroup TortoiseProc
26 * Shows the merge dialog.
28 class MergeCommand : public Command
30 public:
31 /**
32 * Executes the command.
34 virtual bool Execute();