DESCRIPTION

Implement a merge comand that works from the History page

Change-Id: I2fa2971e25b04595cb37e23d72c17ae7b124e09a
Signed-off-by: Juliet Cantu xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2011-01-19 00:09:42.000000000

Uploaded patch set 8.

-------------------------------------
author: Douglas Trujillo
date: 2011-01-19 00:13:51.000000000

Patch Set 8: Looks good to me, approved; Build Successful; IP review completed

rebased

-------------------------------------
author: Douglas Trujillo
date: 2011-01-19 00:14:42.000000000

Change has been successfully merged into the git repository.

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