Without merging, I don't see Kaleidoscope as a legitimate competitor to Changesapp, except in image comparison. Still, I'm glad to see the competition.

(This is one place where Mac devs could also benefit from looking at Beyond Compare or ExamDiff Pro on the Windows side; they're great tools themselves.)