mergetools / gvimdiff2on commit Merge branch 'yd/doc-merge-annotated-tag' into maint (ab24e75)
   1. "$MERGE_TOOLS_DIR/vimdiff"