mergetools / vimdiff2on commit Merge branch 'sk/gitweb-highlight-encoding' into HEAD (13af774)
   1. "$MERGE_TOOLS_DIR/vimdiff"