[UE4] TortoiseSVN Diff & Merge - UE4 asset file

TortoiseSVN Diff - ue4 .uasset

TortoiseSVN > Settings > Diff Viewer > Advanced...

add...
${UE4_ENGINE_ROOT}\Engine\Binaries\Win64\UE4Editor.exe -diff %base %mine

TortoiseSVN Merge - ue4 .uasset

TortoiseSVN > Settings > Diff Viewer > Merge Tool > Advanced...

add...
${UE4_ENGINE_ROOT}\Engine\Binaries\Win64\UE4Editor.exe -diff %theirs %mine %base %merged

Ref:

這個網誌中的熱門文章

[Work Automation] Create Game Console App (VSCode + PowerShell + Qt for Python)

[UE4] Package (VR Works 4.15)