mergetools / vimdiff2on commit Merge branch 'jk/parseopt-string-list' (1949255)
   1. "$MERGE_TOOLS_DIR/vimdiff"