mergetools / gvimdiff3on commit Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint (792c572)
   1. "$MERGE_TOOLS_DIR/vimdiff"