Can TortoiseMerge be used as a difftool with Windows Git Bash?...

Tortoise Git Merge Conflict Colors...

Git (via TortoiseGit) modifies compiled file when a conflict is detected making it corrupted...

Webstorm External Merge tool...

git for Windows: tortoisegitmerge can only be launched from bash command line, but not git gui...

TortoiseGitMerge customization...