delete ds store
diffをvimdiffにした