Replace __int64 with long long type
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp