Comment on Kaleidoscope

Before buying this, I advise you to look at Diffmerge first and see it it is sufficient.
It is not as beautiful as this but very functional.