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: Douglas Trujillo
date: 2012-12-19 23:08:50.000000000

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

rebased

-------------------------------------
author: Douglas Trujillo
date: 2012-12-19 23:08:59.000000000

Patch Set 1: Verified

rebased

-------------------------------------
author: Douglas Trujillo
date: 2012-12-19 23:09:03.000000000

Change has been successfully merged into the git repository.

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