Can git diff be configured to not indicate a conflict on created files with same content?

Question

Scenario: a new file has been created in a remote branch. A file with the same file name and contents has been created in the local branch.

Is it possible to configure git diff so that it doesn't indicate this file is a merge conflict?

I'm using git v1.9.4.