mergetools / vimdiff3on commit Merge branch 'mg/push-repo-option-doc' into maint (2fc85f0)
   1. "$MERGE_TOOLS_DIR/vimdiff"