Set vim as merge tool as well as diff tool