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-06 22:53:14.000000000

Patch Set 1: Abandoned

retargeted to stable-1.2

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