mergetools / vimdiff3on commit Merge branch 'js/pull-rebase-type-shorthand' (c757aa2)
   1. "$MERGE_TOOLS_DIR/vimdiff"