Merge branch 'nd/files-backend-git-dir' into next
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"