Show common ancestor in git merge conflict