mergetools / vimdiff3on commit Merge branch 'tf/gitweb-typofix' (c5918ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"