DESCRIPTION

Reset now resets merging state

ResetOperation did not reset the repository state merging / merging
resolved on a hard / mixed reset.
Now MERGE_HEAD and MERGE_MSG are removed on hard / mixed reset.

Change-Id: If9cc7cfa5c32aa1f9d98d0a2b3998c222a18e38c
Signed-off-by: Marlie Beasley xxx@xxx.xxx


COMMENTS

author: Malia Sampson
date: 2010-09-02 15:19:06.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Malia Sampson
date: 2010-09-02 15:19:06.000000000

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

Looks fine. Thanks.

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