Fix wrong file revision chosen in file diff

Created by: eseliger

The merge base is the commit that the diff applies to, not the specified base OID. Hence, we need to find the merge-base and use that as the base in the file.