DESCRIPTION

Cleanup CheckoutConflictException when JGit API has been fixed 

Bug: 369303
Change-Id: I8e5cf15699d71aea5fbeaee4ed616ad670675183


COMMENTS

author: Leslie Stephenson
date: 2012-03-10 17:17:17.000000000

Uploaded patch set 2.

-------------------------------------
author: Leslie Stephenson
date: 2012-03-10 17:17:40.000000000

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

rebased

-------------------------------------
author: Leslie Stephenson
date: 2012-03-10 17:21:23.000000000

Change has been successfully merged into the git repository.

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