1 // TortoiseMerge - a Diff/Patch program
3 // Copyright (C) 2006-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.
23 * \ingroup TortoiseMerge
24 * The bottom view in three way merges
26 class CBottomView
: public CBaseView
28 DECLARE_DYNCREATE(CBottomView
)
33 void UseMyTextBlock();
34 void UseMyThenTheirTextBlock();
35 void UseTheirTextBlock();
36 void UseTheirThenMyTextBlock();
39 bool OnContextMenu(CPoint point
, int nLine
, DiffStates state
);