mergetools / gvimdiff2on commit Merge branch 'pt/pull-tests' (0e04b24)
   1. "$MERGE_TOOLS_DIR/vimdiff"