1 // TortoiseGitMerge - a Diff/Patch program
3 // Copyright (C) 2006-2008, 2011 - 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.
23 * \ingroup TortoiseMerge
24 * The right view in TortoiseMerge. This is the one which is usually modified and
27 class CRightView
: public CBaseView
29 DECLARE_DYNCREATE(CRightView
)
34 void UseBothLeftFirst();
35 void UseBothRightFirst();
36 void UseLeftBlock(); ///< Use Block from Left
37 void UseLeftFile(); ///< Use File from Left
40 void AddContextItems(CIconMenu
& popup
, DiffStates state
);
42 void UseBlock(int nStart
, int nEnd
);