Merge branch 'cr/git-work-tree-sans-git-dir' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"