Merge branch 'ep/shell-command-substitution'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"