mergetools / vimdiff2on commit Merge branch 'jt/unify-object-info' (00b7cf2)
   1. "$MERGE_TOOLS_DIR/vimdiff"