Cleanup by cppcheck 1.44
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
cleanup