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:07:26.000000000

Patch Set 1:

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

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