Merge branch 'da/mergetool-tests'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"