DESCRIPTION

Refresh workspace and stop monitor also in case of an error

The workspace may be inconsistent after a failing merge operation.
The monitor must be stopped.

Change-Id: Ie17b4af8b46535d5ed84b5e9f5629c75ba09c717
Signed-off-by: Carlie Harper xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2010-08-27 15:10:31.000000000

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



-------------------------------------
author: Douglas Trujillo
date: 2010-08-27 15:10:32.000000000

Change has been successfully merged into the git repository.

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