Make VimDiff the default merge conflict tool