Trim some extra merge commits that don't need to go into the split tree.