DESCRIPTION

Fix wrong display string in Checkout Conflict dialog

When a commit was checked out from history view and there was a
checkout conflict the text "... when checking out 'null'" was shown.
Now the commit id is shown, cut to 7 characters as in the decorator.

Bug: 341872
Change-Id: I3a9de579a446c469e2f865576db19f08e6b849a1
Signed-off-by: Carlie Harper <stefan.lay@sap.com>
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2011-04-07 22:05:09.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2011-04-07 22:05:13.000000000

Patch Set 3:

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

-------------------------------------
author: Douglas Trujillo
date: 2011-04-07 22:05:54.000000000

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

rebased

-------------------------------------
author: Brenden Conley
date: 2011-04-07 22:15:20.000000000

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

Build Unstable 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/358/ : UNSTABLE

-------------------------------------
author: Douglas Trujillo
date: 2011-04-07 22:16:10.000000000

Patch Set 3: Build Successful

verified ui tests locally

-------------------------------------
author: Douglas Trujillo
date: 2011-04-07 22:16:12.000000000

Change has been successfully merged into the git repository.

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