Correctly set comparison first commit when range includes a merge commit

Fixes #3207.

See merge request !1814