Correctly determine MR diff base when MR has merge conflicts

Merged Douwe Maan requested to merge mr-merge-base into master

Merge request reports