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