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 xxx@xxx.xxx

COMMENTS

author: Carlie Harper
date: 2011-04-06 14:27:34.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2011-04-06 14:34:08.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/353/ (1/3)

-------------------------------------
author: Brenden Conley
date: 2011-04-06 14:44:07.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/353/ (2/3)

-------------------------------------
author: Brenden Conley
date: 2011-04-06 14:48:00.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/353/ (3/3)

-------------------------------------
author: Brenden Conley
date: 2011-04-06 14:59:14.000000000

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

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

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