mergetools / vimdiff3on commit Merge branch 'dl/includeif-onbranch' (3707986)
   1. "$MERGE_TOOLS_DIR/vimdiff"