mergetools / vimdiff2on commit Merge branch 'cm/gitweb-project-list-persistent-cgi-fix' (a8624d3)
   1. "$MERGE_TOOLS_DIR/vimdiff"