Merge branch 'jk/no-looking-at-dotgit-outside-repo-final' into next
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"