Help to make and apply a diff

[irugationz]

Sorry for asking this, but i've tryed a lot of times and always got an issue.

I want to make a diff file with all my Hercules emulator changes, to patch it in future, when i need to update the emulator.

I've already done the diff file (right button on hercules folder -> Git Diff -> Save Unified Diff -> Save As "diff.diff".

But when i try to apply the diff file to an full original hercules emulator (just testing it), using richt button -> TortoiseGit -> Apply Patch Serial -> Add "diff.diff" -> Apply, it gives some error:

git.exe am --3way --ignore-space-change --keep-cr "E:\HERCULES\2 CUSTOM\diff.diff"Applying: conf/battle/client.conf        |    6 +-Using index info to reconstruct a base tree...Patch failed at 0001 conf/battle/client.conf        |    6 +-The copy of the patch that failed is found in: .git/rebase-apply/patchWhen you have resolved this problem, run "git am --continue".If you prefer to skip this patch, run "git am --skip" instead.To restore the original branch and stop patching, run "git am --abort". .git/rebase-apply/patch:577: trailing whitespace.        noauction: true        .git/rebase-apply/patch:652: trailing whitespace.        noauction: true        .git/rebase-apply/patch:691: trailing whitespace.        noauction: true        .git/rebase-apply/patch:731: trailing whitespace.        noauction: true        .git/rebase-apply/patch:972: trailing whitespace.        callfunc "invocacard",31515;    error: cannot apply binary patch to 'db/re/map_cache.dat' without full index lineerror: db/re/map_cache.dat: patch does not applyerror: Did you hand edit your patch?It does not apply to blobs recorded in its index. Fail

 
What am I doing wrong to apply the patch?

Thanks!