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: Juliet Cantu
date: 2012-12-19 20:15:39.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2012-12-19 20:21:43.000000000

Patch Set 2:

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

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

Patch Set 2: I would prefer that you didn't submit this

Build Unstable 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/3855/ : UNSTABLE

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