Rewrote diff tool invocation
Updated meld script to use new helper
Updating merge scripts
Cross-platform support (Cygwin and MSysGit) for diff and merge tools
Adding a comment why we try to extract file names