mergetools / gvimdiff3on commit Merge branch 'js/typofixes' (13bf260)
   1. "$MERGE_TOOLS_DIR/vimdiff"