mergetools / gvimdiff3on commit Merge branch 'ct/prompt-untracked-fix' into maint (245dd15)
   1. "$MERGE_TOOLS_DIR/vimdiff"