mergetools / gvimdiffon commit Merge branch 'nd/fetch-pack-shallow-fix' into maint (2ea3df6)
   1. "$MERGE_TOOLS_DIR/vimdiff"