Merge branch 'ct/prompt-untracked-fix' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"