mergetools / vimdiff2on commit Merge branch 'ab/gitweb-author-initials' (e8717b6)
   1. "$MERGE_TOOLS_DIR/vimdiff"