Somehow I found that UE4Editor.exe supports a -diff argument, but I don’t understand the arguments. I can pass it two arguments to diff them, and passing four arguments opens the editor in a merge mode, but I’m not sure which arugment is which.
I’d expect I can pass in BASE LOCAL REMOTE MERGED files but it doesn’t look like that’s the right order.
I found that you can run UE4Editor.exe -diff -h to find the argument order:
Usage:
-diff [options] left right
-diff [options] remote local base result
Options:
-echo Prints back the command arguments and then exits.
-help, -h, -? Display this message and then exits.
Hi As booting-up the engine can take a while I’ve made a simple python script that will issue the diff command to a running unreal instance (so that you can have the diff in under 1 second). I’ve added steps to set-this up in perforce in the repo below :