mergetools / gvimdiff3on commit Merge branch 'js/gitweb-raw-blob-link-in-history' into next (1625826)
   1. "$MERGE_TOOLS_DIR/vimdiff"