TortoiseSVN (32-bit)

Version control is all about having the history of your operating progress. but to really see and check the history, you need to be able to see and check what has modified between 2 points in time, for example, what has modified between 2 releases of your product, or what was modified to repair a bug,
It shows you the 2 versions of a file side-by-side, coloring each changed line in this file.
You can see in this screenshot that TortoiseMerge also colors the changes inside changed lines so you’ll see instantly what exactly has modified.
When you reformat your code or text, sometimes you do not really modification something but only split a long line into multiple ones, otherwise, you merge multiple lines into one.
But that is not all TortoiseMerge is able to try and do for you. It can also assist you to resolve a conflict by showing you your file, the file which has been changed by some other person, and the file as it was before any of you’ve got changed it, in its original state. Then you can simply see where the changes created conflict, and you can select how to resolve that conflict. TortoiseMerge helps here too, as a result of it will apply those patch files for you.
On the left is a small window containing all files in which the patch file needs to change.