blob: d901c336b30b52798849da4875b45f2331b50de9 [file] [log] [blame]
<?xml version="1.0" encoding="UTF-8"?>
<?NLS TYPE="org.eclipse.help.toc"?>
<!--
Copyright (c) 2006-2019 THALES GLOBAL SERVICES.
This program and the accompanying materials are made
available under the terms of the Eclipse Public License 2.0
which is available at https://www.eclipse.org/legal/epl-2.0/
SPDX-License-Identifier: EPL-2.0
Contributors:
Thales - initial API and implementation
-->
<toc label="EMF Diff/Merge Guide" topic="html/EMF-DiffMerge.html">
<topic href="html/EMF-DiffMerge.html" label="User&apos;s Guide">
<topic href="html/EMF-DiffMerge.html#Overview" label="Overview"></topic>
<topic href="html/EMF-DiffMerge.html#Starting_the_Diff.2FMerge_GUI" label="Starting the Diff/Merge GUI"></topic>
<topic href="html/EMF-DiffMerge.html#Configuring_a_Comparison" label="Configuring a Comparison">
<topic href="html/EMF-DiffMerge.html#Predefined_Configurations" label="Predefined Configurations"></topic>
<topic href="html/EMF-DiffMerge.html#Advanced_Matching" label="Advanced Matching"></topic>
<topic href="html/EMF-DiffMerge.html#Other_Advanced_Options" label="Other Advanced Options"></topic>
</topic>
<topic href="html/EMF-DiffMerge.html#Computing_a_Comparison" label="Computing a Comparison"></topic>
<topic href="html/EMF-DiffMerge.html#Exploiting_a_Comparison" label="Exploiting a Comparison">
<topic href="html/EMF-DiffMerge.html#Vertical_Areas" label="Vertical Areas"></topic>
<topic href="html/EMF-DiffMerge.html#Horizontal_Areas" label="Horizontal Areas"></topic>
<topic href="html/EMF-DiffMerge.html#Synthesis_Section" label="Synthesis Section"></topic>
<topic href="html/EMF-DiffMerge.html#Difference_Categories_Dialog" label="Difference Categories Dialog"></topic>
<topic href="html/EMF-DiffMerge.html#Details_Section" label="Details Section"></topic>
<topic href="html/EMF-DiffMerge.html#Difference_Handling_Buttons" label="Difference Handling Buttons"></topic>
<topic href="html/EMF-DiffMerge.html#Textual_Comparison" label="Textual Comparison"></topic>
</topic>
<topic href="html/EMF-DiffMerge.html#Difference_Resolution_in_a_Nutshell" label="Difference Resolution in a Nutshell">
<topic href="html/EMF-DiffMerge.html#Opening_the_GUI" label="Opening the GUI"></topic>
<topic href="html/EMF-DiffMerge.html#Resolving_Differences" label="Resolving Differences"></topic>
<topic href="html/EMF-DiffMerge.html#Saving_Merge_Decisions" label="Saving Merge Decisions"></topic>
</topic>
<topic href="html/EMF-DiffMerge.html#Integration_with_Version_Control" label="Integration with Version Control">
<topic href="html/EMF-DiffMerge.html#Local_File_History" label="Local File History"></topic>
<topic href="html/EMF-DiffMerge.html#Version_Control_Systems" label="Version Control Systems"></topic>
</topic>
</topic>
</toc>