mergetools / vimdiff2on commit Merge branch 'rj/doc-rev-parse' (e30db6d)
   1. "$MERGE_TOOLS_DIR/vimdiff"