Git config for merging to see the merge base code