Merge branch 'dl/difftool-mergetool'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"