DESCRIPTION

Implement a merge comand that works from the History page

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


COMMENTS

author: Juliet Cantu
date: 2011-01-07 13:12:27.000000000

Uploaded patch set 4.

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