add kaleidoscope as diff-merge tool and remove git-diffall option