Kaleidescope for diff/merge