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-26 23:27:53.000000000

Uploaded patch set 5.

-------------------------------------
author: Leslie Stephenson
date: 2010-08-26 23:30:24.000000000

Patch Set 5: Looks good to me, but someone else must approve; IP review completed



-------------------------------------
author: Carlie Harper
date: 2010-08-27 14:40:16.000000000

Patch Set 5: I would prefer that you didn't submit this

(1 inline comment)



Line:145, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelRepository.java -> Now I get an incoming decorator for my local change and an outgoing decorator for my remote change.

-------------------------------------
author: Leslie Stephenson
date: 2010-08-27 14:50:45.000000000

Patch Set 5: No score

(1 inline comment)



Line:145, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelRepository.java -> Damn, I miss this ...

Done

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