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: I751deebd3b8ed3cd7e07c07182865b14525b657f


COMMENTS

author: Douglas Trujillo
date: 2012-12-19 23:14:10.000000000

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



-------------------------------------
author: Douglas Trujillo
date: 2012-12-19 23:14:12.000000000

Change has been successfully merged into the git repository.

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