TortoiseSVN Diff color codes
Check the TortoiseSVN Manual: TortoiseMerge | Colour Settings Page. This is the default color scheme (see it in TortoiseMerge | File | Settings | Colors): It also makes sense to know the line status icons meaning.
tortoisemerge
Why can’t I use TortoiseMerge as my git merge tool on Windows?
If you have the latest git, run this command line once: git config merge.tool tortoisemerge Important: Do not add a .exe extension to the command. If that fails, or if you want to add a different merge tool that git doesn’t know about, do this: Open one of the following in an editor: 64-bit git: … Read more