Use kaleidoscope as diff/merge tool