DESCRIPTION

Suggest HEAD version in the MergeTool dialog

The workspace file is premerged and full of conflict markers intended
for manual resolution. Using the workspace version with a merge tool
is most confusing to users.

Change-Id: I6863ffe4e3731ce618d133c737f15905da8b3273


COMMENTS

author: Brenden Conley
date: 2012-12-19 20:39:08.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/3856/ 

-------------------------------------
author: Brenden Conley
date: 2012-12-19 20:52:57.000000000

Patch Set 1: Verified

Build Successful 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/3856/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2012-12-20 00:06:33.000000000

Patch Set 1: Abandoned

already merged as Change-Id: I751deebd3b8ed3cd7e07c07182865b14525b657f

-------------------------------------
