DESCRIPTION

Don't display merge commit as conflicting

GitModelCommit.calculateKid() use right now commit time to determinate
change direction (incoming/outgoing) this is more reliable then
comparing remote vs ancestor and base vs ancestor.

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


COMMENTS

