Merge branch 'ao/merge-verbosity-getenv-just-once'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"