DESCRIPTION

Merge: provide user feedback

After merge, the user should get feedback about
what happened.

Change-Id: Ifdbd00e8513e9784b656a7ce99bcf533d6f66111
Signed-off-by: Willow Cantrell xxx@xxx.xxx

COMMENTS

author: Gerrit Johnathan Pham
date: 2010-07-02 14:25:02.000000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
author: Carlie Harper
date: 2010-07-02 14:31:21.000000000

Uploaded patch set 2.

-------------------------------------
author: Carlie Harper
date: 2010-07-02 14:31:37.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Carlie Harper
date: 2010-07-02 14:31:37.000000000

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



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