For some time now i started to notice the amount of time i wasted in solving version conflicts. The GNU diff works great with small change sets, but having a visual diff tool helps a lot when you’re dealing with long files with lots of diffs. I used several visuall-diff-editors whit the several version-control software [...]