I was applying a diff file of an opensource project on the top of my repository using git-am :
git am -3 < /Downloads/refactorWork.diff
but
Use,
git apply -3 patchName.patch
when you encounter conflicts, open your mergtool and resolve conflicts
git mergetool
that's all :)