Diff in Git compares local file changes with version two commits back

[deadlydog]

Even with Diff All Files set to compare the Unmodified Version of a file, it is comparing the workspace version of the file with a version from two commits back. So instead of just seeing the changes I have made locally to the file, I also see changes that were made and committed in the previous Merge commit for that file in the branch.