deleted git diff/merge wrappers, too clunky