Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"