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: Iff2fc7de0237b9cb91ea78fde7334a4c62424d10


COMMENTS

author: Douglas Trujillo
date: 2012-12-19 23:13:55.000000000

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



-------------------------------------
author: Douglas Trujillo
date: 2012-12-19 23:13:57.000000000

Change has been successfully merged into the git repository.

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