DESCRIPTION

Resolve handler conflict for merge command

Both the merge command handlers were "active" if nothing was
selected. They should instead both be inactive.

Bug: 324517
Change-Id: Iece3fd33c74ba903e9b4f091c4fae3f5eebe50b6
Signed-off-by: Willow Cantrell xxx@xxx.xxx


COMMENTS

author: Carlie Harper
date: 2010-09-09 12:42:01.000000000

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



-------------------------------------
author: Carlie Harper
date: 2010-09-09 12:42:04.000000000

Change has been successfully merged into the git repository.

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