mergetools / gvimdiffon commit Merge branch 'mm/push-simple-doc' into maint (d4e7b9b)
   1. "$MERGE_TOOLS_DIR/vimdiff"