mergetools / gvimdiff2on commit Merge branch 'jt/push-options-doc' into maint (058d655)
   1. "$MERGE_TOOLS_DIR/vimdiff"