DESCRIPTION

Don't display merge commit as conflicting

GitModelCommit.calculateKid() use right "left-right mode" described by
Yoselin Hanna[1] to calculate commit direction.

1. http://egit.eclipse.org/r/#patch,sidebyside,1358,2,/COMMIT_MSG

Bug: 322496
Bug: 323057
Change-Id: Ia304b382e476daad5e2db3c852d91985e0199b92
Signed-off-by: Leslie Stephenson xxx@xxx.xxx


COMMENTS

author: Leslie Stephenson
date: 2010-08-27 14:51:23.000000000

Uploaded patch set 6.

-------------------------------------
author: Carlie Harper
date: 2010-08-27 15:15:17.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Carlie Harper
date: 2010-08-27 15:15:17.000000000

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

Nice that we do not need IP review anymore ;-)

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