Could you not use --first-parent option to test only at the merge-points?