blob: 696b2bffe2491d5212877392d881469b8b25ad6e [file] [log] [blame]
<?php
set_include_path($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common" . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] . "/projects" . PATH_SEPARATOR . get_include_path());
require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
$App = new App();
$Nav = new Nav();
$Menu = new Menu();
include($App->getProjectCommon());
# All on the same line to unclutter the user's desktop'
#*****************************************************************************
#
# template.php
#
# Author: Igor Vinnykov
# Date: 2007-11-23
#
# Description: Autogenerated for eclipse.org site pages from Eclipse IDE help
#
#
#****************************************************************************
#
# Begin: page-specific settings. Change these.
$pageTitle = "Eclipse Subversive - Documentation";
$pageKeywords = "Subversive, Subversion, SVN, Team Provider, documentation, user guid";
$pageAuthor = "Igor Vinnykov";
include("_projectCommon.php"); # All on the same line to unclutter the user's desktop'
# Paste your HTML content between the EOHTML markers!
$html = <<<EOHTML
<div id="midcolumn">
<h2>Working with Compare Editor</h2>
<p>Actually there are a lot of examples of situations when it will be comfortable for the user to use Compare Editor. The main and the most frequently met is manual merging of the conflict changes. Then in such editor the user can easily examine all the changes, apply all needed ones, make his own ones and save the file.</p>
<img border="0" src="../images/inside.png"/>
<br/>
<a href="compareEditor/compare_oc.php">Making your own changes</a>
<br/>
<a href="compareEditor/compare_ac.php">Another user changes</a>
<br/>
<a href="compareEditor/compare_cc.php">Working with conflict changes</a>
<br/>
<br/>
</div>
EOHTML;
# Generate the web page
$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>