DESCRIPTION

Show proper message when merge hits checkout conflicts

Depends on JGit change I1efcd93a43ecbf4a40583e0fc9d8d53cffc98cae 

Bug: 327573
Change-Id: Ibe26cb549a69a74a1898fe4fb6f77646d5e91d64
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2011-12-08 23:00:59.000000000

Uploaded patch set 2.

-------------------------------------
author: Douglas Trujillo
date: 2011-12-08 23:01:27.000000000

Patch Set 2:

rebased

-------------------------------------
author: Juliet Cantu
date: 2011-12-11 19:56:03.000000000

Patch Set 2: Looks good to me, but someone else must approve



-------------------------------------
author: Douglas Trujillo
date: 2011-12-11 21:56:53.000000000

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



-------------------------------------
author: Douglas Trujillo
date: 2011-12-11 21:56:54.000000000

Change has been successfully merged into the git repository.

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