mergetools / gvimdiff2on commit Merge branch 'ct/prompt-untracked-fix' (5f15cba)
   1. "$MERGE_TOOLS_DIR/vimdiff"