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: Douglas Trujillo
date: 2012-12-19 23:08:01.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2012-12-19 23:08:11.000000000

Patch Set 3:

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

-------------------------------------
author: Douglas Trujillo
date: 2012-12-19 23:09:36.000000000

Patch Set 3: Verified; Looks good to me, approved; IP review completed

rebased

-------------------------------------
author: Douglas Trujillo
date: 2012-12-19 23:09:38.000000000

Change has been successfully merged into the git repository.

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