DESCRIPTION

Merge branch 'stable-2.2'

* stable-2.2:
  Prepare post 2.2.0.201212191850-r builds
  EGit v2.2.0.201212191850-r
  Suggest HEAD version in the MergeTool dialog
  Treat a dirty worktree like a normal condition

Change-Id: Ie3f9d0eb15436c77ef35b9ad6b6a9019fae4ce8e
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Brenden Conley
date: 2012-12-21 00:50:28.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2012-12-21 00:51:00.000000000

Patch Set 1: Fails

Build Failed 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/3868/ : FAILURE

-------------------------------------
author: Douglas Trujillo
date: 2012-12-21 01:08:31.000000000

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



-------------------------------------
author: Douglas Trujillo
date: 2012-12-21 01:08:32.000000000

Change has been successfully merged into the git repository.

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