Merge branch 'nd/stop-setenv-work-tree'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"