DESCRIPTION

Fix issues with common ancestor version in compare view

Change I92c6e943 introduced a bug in compare view. Every file opened
in compare editor from synchronize view had marked its content as
conflicting because the common ancestor was not defined.

Change-Id: I7e95eaa407f0767b0cdd84a1c53b5d3865cd2c7c
Signed-off-by: Leslie Stephenson xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2011-01-26 23:00:43.000000000

Uploaded patch set 6.

-------------------------------------
author: Douglas Trujillo
date: 2011-01-26 23:03:18.000000000

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

- rebased
- fixed typo in commit message

-------------------------------------
author: Douglas Trujillo
date: 2011-01-26 23:03:20.000000000

Change has been successfully merged into the git repository.

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