git diff between two branches not matching the changes during a merge

Question

I have two branches, master and feature. If I do:

git diff --name-only master..feature

I get a long list of files, some of them source code,