mergetools / gvimdiff2on commit Merge branch 'jk/send-pack-stdio' into maint (1e274ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"