mergetools / gvimdiff3on commit Merge branch 'js/replace-edit-use-editor-configuration' into maint (8854ded)
   1. "$MERGE_TOOLS_DIR/vimdiff"