In my work process I need to provide a list of files to my server admin. The list comes from the merge of my working branch (Branch A) into Master branch.
So I merge
Narrow it down using git log --merges --author to figure out the commit you want and then try
git log --merges --author
git diff --name-only ${MERGE_SHA}^1..${MERGE_SHA}