DESCRIPTION

Treat a dirty worktree like a normal condition

Instead of an ugly error dialog, present the result in the merge result
dialog.

Change-Id: Ifc6f9bc7b82aaa0166ecc9d424a72f89b1b9a91f


COMMENTS

author: Brenden Conley
date: 2012-12-19 19:54:15.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2012-12-19 20:07:26.000000000

Patch Set 1: Verified

Build Successful 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/3853/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2012-12-20 00:05:57.000000000

Patch Set 1: Abandoned

already merged as Change-Id: Iff2fc7de0237b9cb91ea78fde7334a4c62424d10

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