mergetools / gvimdiff2on commit Merge branch 'ao/config-api-doc' (d9a0ddc)
   1. "$MERGE_TOOLS_DIR/vimdiff"