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 14:56:31.000000000

Uploaded patch set 5.

-------------------------------------
author: Juliet Cantu
date: 2011-01-07 14:57:00.000000000

Patch Set 5: Looks good to me, but someone else must approve; IP review completed

/Users/me/LocalRepositoriesTests/FirstRepository/.git

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