1 files changed, 64 insertions, 0 deletions
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html
new file mode 100644
index 0000000000..a44a6b33f7
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/0.10/Merge-Tool.html
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>EGit 0.10 New and Noteworthy - Merge Tool</title>
+		<link type="text/css" rel="stylesheet" href="../../../book.css"/>
+	</head>
+	<body>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<th style="width: 100%" align="center" colspan="3">Merge Tool</th>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Cherry-pick-Support.html" title="Cherry-pick Support">
+						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right">
+					<a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Cherry-pick Support</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Synchronize View - Local Changes in Changeset Mode</td>
+			</tr>
+		</table><hr/>
+		<h1 id="Merge_Tool">Merge Tool</h1>
+		<p>EGit now supports a 
+			<a href="../../../EGit/User_Guide/Tasks.html#Using_Merge_Tool" title="EGit/User_Guide#Using_Merge_Tool">visual merge tool</a> to better support resolving conflicts detected during merge, rebase or cherry-pick
+		</p>
+		<p>
+			<img border="0" src="images/Egit-0.10-merge-tool.png"/>
+		</p><hr/>
+		<table class="navigation" style="width: 100%;" border="0" summary="navigation">
+			<tr>
+				<td style="width: 20%" align="left">
+					<a href="Cherry-pick-Support.html" title="Cherry-pick Support">
+						<img alt="Previous" border="0" src="../../../images/prev.gif"/>
+					</a>
+				</td>
+				<td style="width: 60%" align="center">
+					<a href="0.10.html" title="EGit 0.10 New and Noteworthy">
+						<img alt="EGit 0.10 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+					</a>
+				</td>
+				<td style="width: 20%" align="right">
+					<a href="Synchronize-View-Local-Changes-in-Changeset-Mode.html" title="Synchronize View - Local Changes in Changeset Mode">
+						<img alt="Next" border="0" src="../../../images/next.gif"/>
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td style="width: 20%" align="left" valign="top">Cherry-pick Support</td>
+				<td style="width: 60%" align="center"></td>
+				<td style="width: 20%" align="right" valign="top">Synchronize View - Local Changes in Changeset Mode</td>
+			</tr>
+		</table>
+	</body>
+</html>
+\ No newline at end of file