add use vimdiff as git mergetool
change margin