This repository was founded for testing KDiff3 setup on my Mac

1. Clone this repository
2. Try to merge branch side-changes into master
3. Try to solve resulting conflict by git mergetool

Files needed to setup KDiff3 on Mac (Lion in my case) can be found on https://gist.github.com/1304005