Improve git diff/merge tools config
Add command for vimdiff with original file on disk