mergetools / vimdiff3on commit Merge branch 'mm/am-c-doc' into maint (d86679f)
   1. "$MERGE_TOOLS_DIR/vimdiff"