Removing merge commits that do not contribute to the tree during
listing, reduces the number of merge commits to be subsequently pruned.
In future any remaining merges may indicate a problem, or be used to
reduce conflict cases by preserving them should users be utilizing
manual merges to resolve patch conflicts.
Change-Id: I8118db5acace6cb5d3b056c3d2cdaf398026c84c