mergetools / vimdiff2on commit Merge branch 'jj/log-doc' (a2cb44c)
   1. "$MERGE_TOOLS_DIR/vimdiff"